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: Add some onOpen and onClose logic, make websocketpp logging mirror debug setting

Browse Source
This commit is contained in:
tt2468 2021-04-28 13:24:34 -07:00
parent 0be9174bb1
commit af46271b27
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/WebSocketServer.cpp
View File

@ -14,7 +14,8 @@
WebSocketServer::WebSocketServer() : WebSocketServer::WebSocketServer() :
_sessions() _sessions()
{ {
_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::all);
_server.get_elog().clear_channels(websocketpp::log::elevel::all);
_server.init_asio(); _server.init_asio();
#ifndef _WIN32 #ifndef _WIN32
@ -76,10 +77,21 @@ void WebSocketServer::Start()
_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
if (conf->DebugEnabled) {
_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_elog().set_channels(websocketpp::log::elevel::all);
_server.get_alog().clear_channels(websocketpp::log::elevel::info);
} else {
_server.get_alog().clear_channels(websocketpp::log::alevel::all);
_server.get_elog().clear_channels(websocketpp::log::elevel::all);
}
_server.reset(); _server.reset();
websocketpp::lib::error_code errorCode; websocketpp::lib::error_code errorCode;
_server.listen(_serverPort, errorCode); _server.listen(websocketpp::lib::asio::ip::tcp::v4(), _serverPort, errorCode);
if (errorCode) { if (errorCode) {
std::string errorCodeMessage = errorCode.message(); std::string errorCodeMessage = errorCode.message();
@ -185,12 +197,19 @@ WebSocketSession *WebSocketServer::GetWebSocketSession(websocketpp::connection_h
void WebSocketServer::onOpen(websocketpp::connection_hdl hdl) void WebSocketServer::onOpen(websocketpp::connection_hdl hdl)
{ {
; auto conn = _server.get_con_from_hdl(hdl);
std::unique_lock<std::mutex> lock(_sessionMutex);
_sessions[hdl].SetRemoteAddress(conn->get_remote_endpoint());
_sessions[hdl].SetConnectedAt(QDateTime::currentSecsSinceEpoch());
lock.unlock();
} }
void WebSocketServer::onClose(websocketpp::connection_hdl hdl) void WebSocketServer::onClose(websocketpp::connection_hdl hdl)
{ {
; std::unique_lock<std::mutex> lock(_sessionMutex);
_sessions.erase(hdl);
lock.unlock();
} }
void WebSocketServer::onMessage(websocketpp::connection_hdl hdl, websocketpp::server<websocketpp::config::asio>::message_ptr message) void WebSocketServer::onMessage(websocketpp::connection_hdl hdl, websocketpp::server<websocketpp::config::asio>::message_ptr message)

1
src/forms/SettingsDialog.cpp
View File

@ -124,6 +124,7 @@ void SettingsDialog::FormAccepted()
bool needsRestart = false; bool needsRestart = false;
// I decided not to restart the server if debug is changed. Might mess with peoples' scripts
if (conf->ServerEnabled != ui->enableWebSocketServerCheckBox->isChecked()) { if (conf->ServerEnabled != ui->enableWebSocketServerCheckBox->isChecked()) {
needsRestart = true; needsRestart = true;
} else if (conf->AuthRequired != ui->enableAuthenticationCheckBox->isChecked()) { } else if (conf->AuthRequired != ui->enableAuthenticationCheckBox->isChecked()) {