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

requesthandler: Don't require session for Request Handler

Browse Source 
Required to call requests in situations where a session is not
relevant.
This commit is contained in:
tt2468 2022-05-10 19:51:51 -07:00
parent 1cd12c1023
commit 3303acfcca
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/requesthandler/RequestHandler.h
View File

@ -37,7 +37,7 @@ typedef RequestResult(RequestHandler::*RequestMethodHandler)(const Request&);
class RequestHandler { class RequestHandler {
public: public:
RequestHandler(SessionPtr session); RequestHandler(SessionPtr session = nullptr);
RequestResult ProcessRequest(const Request& request); RequestResult ProcessRequest(const Request& request);
std::vector<std::string> GetRequestList(); std::vector<std::string> GetRequestList();

9
src/requesthandler/RequestHandler_General.cpp
View File

@ -92,8 +92,13 @@ RequestResult RequestHandler::GetStats(const Request&)
{ {
json responseData = Utils::Obs::ObjectHelper::GetStats(); json responseData = Utils::Obs::ObjectHelper::GetStats();
responseData["webSocketSessionIncomingMessages"] = _session->IncomingMessages(); if (_session) {
responseData["webSocketSessionOutgoingMessages"] = _session->OutgoingMessages(); responseData["webSocketSessionIncomingMessages"] = _session->IncomingMessages();
responseData["webSocketSessionOutgoingMessages"] = _session->OutgoingMessages();
} else {
responseData["webSocketSessionIncomingMessages"] = nullptr;
responseData["webSocketSessionOutgoingMessages"] = nullptr;
}
return RequestResult::Success(responseData); return RequestResult::Success(responseData);
} }