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

Merge pull request #298 from Palakis/bugfix/264-debug-logging

Browse Source 
fix debug logging
This commit is contained in:
Stéphane Lepin 2019-04-19 19:16:11 +02:00 committed by GitHub
commit b8af848d3a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/WSEvents.cpp
View File

@ -224,8 +224,9 @@ void WSEvents::broadcastUpdate(const char* updateType,
QString json = obs_data_get_json(update); QString json = obs_data_get_json(update);
_srv->broadcast(json.toStdString()); _srv->broadcast(json.toStdString());
if (Config::Current()->DebugEnabled) if (Config::Current()->DebugEnabled) {
blog(LOG_DEBUG, "Update << '%s'", json.toUtf8().constData()); blog(LOG_INFO, "Update << '%s'", json.toUtf8().constData());
}
} }
void WSEvents::hookTransitionBeginEvent() { void WSEvents::hookTransitionBeginEvent() {

21
src/WSRequestHandler.cpp
View File

@ -139,7 +139,22 @@ WSRequestHandler::WSRequestHandler(QVariantHash& connProperties) :
{ {
} }
obs_data_t* WSRequestHandler::processIncomingMessage(std::string& textMessage) { std::string WSRequestHandler::processIncomingMessage(std::string& textMessage) {
if (Config::Current()->DebugEnabled) {
blog(LOG_INFO, "Request >> '%s'", textMessage.c_str());
}
OBSDataAutoRelease responseData = processRequest(textMessage);
std::string response = obs_data_get_json(responseData);
if (Config::Current()->DebugEnabled) {
blog(LOG_INFO, "Response << '%s'", response.c_str());
}
return response;
}
HandlerResponse WSRequestHandler::processRequest(std::string& textMessage){
std::string msgContainer(textMessage); std::string msgContainer(textMessage);
const char* msg = msgContainer.c_str(); const char* msg = msgContainer.c_str();
@ -149,10 +164,6 @@ obs_data_t* WSRequestHandler::processIncomingMessage(std::string& textMessage) {
return SendErrorResponse("invalid JSON payload"); return SendErrorResponse("invalid JSON payload");
} }
if (Config::Current()->DebugEnabled) {
blog(LOG_DEBUG, "Request >> '%s'", msg);
}
if (!hasField("request-type") || !hasField("message-id")) { if (!hasField("request-type") || !hasField("message-id")) {
return SendErrorResponse("missing request parameters"); return SendErrorResponse("missing request parameters");
} }

4
src/WSRequestHandler.h
View File

@ -36,7 +36,7 @@ class WSRequestHandler : public QObject {
public: public:
explicit WSRequestHandler(QVariantHash& connProperties); explicit WSRequestHandler(QVariantHash& connProperties);
~WSRequestHandler(); ~WSRequestHandler();
obs_data_t* processIncomingMessage(std::string& textMessage); std::string processIncomingMessage(std::string& textMessage);
bool hasField(QString name); bool hasField(QString name);
private: private:
@ -45,6 +45,8 @@ class WSRequestHandler : public QObject {
QVariantHash& _connProperties; QVariantHash& _connProperties;
OBSDataAutoRelease data; OBSDataAutoRelease data;
HandlerResponse processRequest(std::string& textMessage);
HandlerResponse SendOKResponse(obs_data_t* additionalFields = nullptr); HandlerResponse SendOKResponse(obs_data_t* additionalFields = nullptr);
HandlerResponse SendErrorResponse(const char* errorMessage); HandlerResponse SendErrorResponse(const char* errorMessage);
HandlerResponse SendErrorResponse(obs_data_t* additionalFields = nullptr); HandlerResponse SendErrorResponse(obs_data_t* additionalFields = nullptr);

8
src/WSServer.cpp
View File

@ -139,13 +139,7 @@ void WSServer::onMessage(connection_hdl hdl, server::message_ptr message)
locker.unlock(); locker.unlock();
WSRequestHandler handler(connProperties); WSRequestHandler handler(connProperties);
OBSDataAutoRelease responseData = handler.processIncomingMessage(payload); std::string response = handler.processIncomingMessage(payload);
std::string response = obs_data_get_json(responseData);
if (Config::Current()->DebugEnabled) {
blog(LOG_DEBUG, "Response << '%s'", response.c_str());
}
_server.send(hdl, response, websocketpp::frame::opcode::text); _server.send(hdl, response, websocketpp::frame::opcode::text);