ETM-Schurig/powersync-core
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update JsonRpc debug categories and fix some inlcudes

Browse Source
This commit is contained in:
Simon Stürz 2025-10-13 14:29:10 +02:00
parent d8dcff002c
commit a74f747df8
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libnymea-core/jsonrpc/configurationhandler.cpp
View File

@ -71,6 +71,7 @@
#include "configurationhandler.h" #include "configurationhandler.h"
#include "nymeacore.h" #include "nymeacore.h"
#include "nymeaconfiguration.h" #include "nymeaconfiguration.h"
#include "loggingcategories.h"
#include "platform/platform.h" #include "platform/platform.h"
#include "platform/platformsystemcontroller.h" #include "platform/platformsystemcontroller.h"

8
libnymea-core/jsonrpc/jsonrpcserverimplementation.cpp
View File

@ -576,7 +576,7 @@ void JsonRPCServerImplementation::processJsonPacket(TransportInterface *interfac
QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error); QJsonDocument jsonDoc = QJsonDocument::fromJson(data, &error);
if(error.error != QJsonParseError::NoError) { if(error.error != QJsonParseError::NoError) {
qCWarning(dcJsonRpc) << "Failed to parse JSON data" << data << ":" << error.errorString(); qCWarning(dcJsonRpc()) << "Failed to parse JSON data" << data << ":" << error.errorString();
sendErrorResponse(interface, clientId, -1, QString("Failed to parse JSON data: %1").arg(error.errorString())); sendErrorResponse(interface, clientId, -1, QString("Failed to parse JSON data: %1").arg(error.errorString()));
return; return;
} }
@ -586,7 +586,7 @@ void JsonRPCServerImplementation::processJsonPacket(TransportInterface *interfac
bool success; bool success;
int commandId = message.value("id").toInt(&success); int commandId = message.value("id").toInt(&success);
if (!success) { if (!success) {
qCWarning(dcJsonRpc) << "Error parsing command. Missing \"id\":" << message; qCWarning(dcJsonRpc()) << "Error parsing command. Missing \"id\":" << message;
sendErrorResponse(interface, clientId, commandId, "Error parsing command. Missing 'id'"); sendErrorResponse(interface, clientId, commandId, "Error parsing command. Missing 'id'");
return; return;
} }
@ -594,7 +594,7 @@ void JsonRPCServerImplementation::processJsonPacket(TransportInterface *interfac
QString methodString = message.value("method").toString(); QString methodString = message.value("method").toString();
QStringList commandList = methodString.split('.'); QStringList commandList = methodString.split('.');
if (commandList.count() != 2) { if (commandList.count() != 2) {
qCWarning(dcJsonRpc) << "Error parsing method.\nGot:" << message.value("method").toString() << "\nExpected: \"Namespace.method\""; qCWarning(dcJsonRpc()) << "Error parsing method.\nGot:" << message.value("method").toString() << "\nExpected: \"Namespace.method\"";
sendErrorResponse(interface, clientId, commandId, QString("Error parsing method. Got: '%1'', Expected: 'Namespace.method'").arg(message.value("method").toString())); sendErrorResponse(interface, clientId, commandId, QString("Error parsing method. Got: '%1'', Expected: 'Namespace.method'").arg(message.value("method").toString()));
return; return;
} }
@ -607,7 +607,7 @@ void JsonRPCServerImplementation::processJsonPacket(TransportInterface *interfac
token = message.value("token").toByteArray(); token = message.value("token").toByteArray();
} else if (message.value("token").toByteArray() != token) { } else if (message.value("token").toByteArray() != token) {
qCWarning(dcJsonRpc()) << "Client changed token without redoing the handshake."; qCWarning(dcJsonRpc()) << "Client changed token without redoing the handshake.";
qCDebug(dcJsonRpc) << "Old token:" << token << "new token:" << message.value("token").toByteArray(); qCDebug(dcJsonRpc()) << "Old token:" << token << "new token:" << message.value("token").toByteArray();
sendUnauthorizedResponse(interface, clientId, commandId, "Changing the user (token) requires a new handshake. Call JSONRPC.Hello."); sendUnauthorizedResponse(interface, clientId, commandId, "Changing the user (token) requires a new handshake. Call JSONRPC.Hello.");
interface->terminateClientConnection(clientId); interface->terminateClientConnection(clientId);
qCWarning(dcJsonRpc()) << "Staring connection lockdown timer"; qCWarning(dcJsonRpc()) << "Staring connection lockdown timer";

6
libnymea-core/jsonrpc/tagshandler.cpp
View File

@ -142,7 +142,7 @@ JsonReply *TagsHandler::RemoveTag(const QVariantMap &params) const
void TagsHandler::onTagAdded(const Tag &tag) void TagsHandler::onTagAdded(const Tag &tag)
{ {
qCDebug(dcJsonRpc) << "Notify \"Tags.TagAdded\""; qCDebug(dcJsonRpc()) << "Notify \"Tags.TagAdded\"";
QVariantMap params; QVariantMap params;
params.insert("tag", pack(tag)); params.insert("tag", pack(tag));
emit TagAdded(params); emit TagAdded(params);
@ -150,7 +150,7 @@ void TagsHandler::onTagAdded(const Tag &tag)
void TagsHandler::onTagRemoved(const Tag &tag) void TagsHandler::onTagRemoved(const Tag &tag)
{ {
qCDebug(dcJsonRpc) << "Notify \"Tags.TagRemoved\""; qCDebug(dcJsonRpc()) << "Notify \"Tags.TagRemoved\"";
QVariantMap params; QVariantMap params;
params.insert("tag", pack(tag)); params.insert("tag", pack(tag));
emit TagRemoved(params); emit TagRemoved(params);
@ -158,7 +158,7 @@ void TagsHandler::onTagRemoved(const Tag &tag)
void TagsHandler::onTagValueChanged(const Tag &tag) void TagsHandler::onTagValueChanged(const Tag &tag)
{ {
qCDebug(dcJsonRpc) << "Notify \"Tags.TagValueChanged\""; qCDebug(dcJsonRpc()) << "Notify \"Tags.TagValueChanged\"";
QVariantMap params; QVariantMap params;
params.insert("tag", pack(tag)); params.insert("tag", pack(tag));
emit TagValueChanged(params); emit TagValueChanged(params);

1
tests/auto/mqttbroker/testmqttbroker.cpp
View File

@ -32,6 +32,7 @@
#include "nymeacore.h" #include "nymeacore.h"
#include "servers/mqttbroker.h" #include "servers/mqttbroker.h"
#include "servers/mocktcpserver.h" #include "servers/mocktcpserver.h"
#include "loggingcategories.h"
#include <mqttclient.h> #include <mqttclient.h>