Mirrored_Repos/obs-websocket
1
0
Fork 0
mirror of https://github.com/Palakis/obs-websocket.git synced 2024-08-30 18:12:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

WebSocketServer: Store debug setting

Browse Source
This commit is contained in:
tt2468 2021-04-29 08:24:27 -07:00
parent 3ac0f0edee
commit 1cee256cb3
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/WebSocketServer.cpp
View File

@ -79,12 +79,13 @@ void WebSocketServer::Start()
} }
_serverPort = conf->ServerPort; _serverPort = conf->ServerPort;
_debugEnabled = conf->DebugEnabled;
_authenticationRequired = conf->AuthRequired; _authenticationRequired = conf->AuthRequired;
_authenticationSalt = Utils::Crypto::GenerateSalt(); _authenticationSalt = Utils::Crypto::GenerateSalt();
_authenticationSecret = Utils::Crypto::GenerateSecret(conf->ServerPassword.toStdString(), _authenticationSalt); _authenticationSecret = Utils::Crypto::GenerateSecret(conf->ServerPassword.toStdString(), _authenticationSalt);
// Set log levels if debug is enabled // Set log levels if debug is enabled
if (conf->DebugEnabled) { if (_debugEnabled) {
_server.get_alog().set_channels(websocketpp::log::alevel::all); _server.get_alog().set_channels(websocketpp::log::alevel::all);
_server.get_alog().clear_channels(websocketpp::log::alevel::frame_header | websocketpp::log::alevel::frame_payload | websocketpp::log::alevel::control); _server.get_alog().clear_channels(websocketpp::log::alevel::frame_header | websocketpp::log::alevel::frame_payload | websocketpp::log::alevel::control);
_server.get_elog().set_channels(websocketpp::log::elevel::all); _server.get_elog().set_channels(websocketpp::log::elevel::all);

1
src/WebSocketServer.h
View File

@ -89,6 +89,7 @@ class WebSocketServer : QObject
std::mutex _sessionMutex; std::mutex _sessionMutex;
std::map<websocketpp::connection_hdl, WebSocketSession, std::owner_less<websocketpp::connection_hdl>> _sessions; std::map<websocketpp::connection_hdl, WebSocketSession, std::owner_less<websocketpp::connection_hdl>> _sessions;
uint16_t _serverPort; uint16_t _serverPort;
bool _debugEnabled;
bool _authenticationRequired; bool _authenticationRequired;
std::string _authenticationSecret; std::string _authenticationSecret;
std::string _authenticationSalt; std::string _authenticationSalt;