From b1296fb2854371250641fd779ad91a79bae804ed Mon Sep 17 00:00:00 2001 From: Denis Sumin <denis.smolov@demlabs.net> Date: Tue, 30 Jul 2024 14:49:04 +0000 Subject: [PATCH] lil fix --- CMakeLists.txt | 3 +++ CellframeNodeDiagtool/AbstractDiagnostic.cpp | 2 +- CellframeNodeDiagtool/NotifyWorker.cpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c03cd0..99146be 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -23,6 +23,7 @@ if(UNIX) ./CellframeNodeDiagtool/DiagnosticWorker.cpp ./CellframeNodeDiagtool/AbstractDiagnostic.cpp ./CellframeNodeDiagtool/MacDiagnostic.cpp + ./CellframeNodeDiagtool/NotifyWorker.cpp ./CellframeNodeTray/NodeTrayCommandController.cpp ./CellframeNodeTray/qml.qrc ./CellframeNodeTray/Resources.qrc @@ -36,6 +37,7 @@ if(UNIX) ./CellframeNodeDiagtool/DiagnosticWorker.cpp ./CellframeNodeDiagtool/AbstractDiagnostic.cpp ./CellframeNodeDiagtool/LinuxDiagnostic.cpp + ./CellframeNodeDiagtool/NotifyWorker.cpp ./CellframeNodeTray/NodeTrayCommandController.cpp ./CellframeNodeTray/qml.qrc ./CellframeNodeTray/Resources.qrc @@ -51,6 +53,7 @@ if(WIN32) ./CellframeNodeDiagtool/DiagnosticWorker.cpp ./CellframeNodeDiagtool/AbstractDiagnostic.cpp ./CellframeNodeDiagtool/WinDiagnostic.cpp + ./CellframeNodeDiagtool/NotifyWorker.cpp ./CellframeNodeTray/NodeTrayCommandController.cpp ./CellframeNodeTray/qml.qrc ./CellframeNodeTray/Resources.qrc diff --git a/CellframeNodeDiagtool/AbstractDiagnostic.cpp b/CellframeNodeDiagtool/AbstractDiagnostic.cpp index 65f4128..763bc0c 100644 --- a/CellframeNodeDiagtool/AbstractDiagnostic.cpp +++ b/CellframeNodeDiagtool/AbstractDiagnostic.cpp @@ -264,7 +264,7 @@ QJsonObject AbstractDiagnostic::get_net_info(QString net) resultObj.insert("links_count", match_req.captured(1)); } - // ---------- Sync statuses ---------------- + // ---------- Sync status ---------------- QRegularExpression rxZeroChainSync(R"(zerochain: \s+status: (\S+|.+)\s+current: (\S+)\s+in network: (\S+)\s+percent: (\S+|.+))"); QJsonObject objZeroChain; diff --git a/CellframeNodeDiagtool/NotifyWorker.cpp b/CellframeNodeDiagtool/NotifyWorker.cpp index 625ab91..b5c275f 100644 --- a/CellframeNodeDiagtool/NotifyWorker.cpp +++ b/CellframeNodeDiagtool/NotifyWorker.cpp @@ -173,7 +173,7 @@ void NotifyWorker::socketReadyRead() QJsonDocument reply = QJsonDocument::fromJson(list[i], &error); if (error.error != QJsonParseError::NoError) { // qWarning()<<"Notify parse error. " << error.errorString(); // more logs - return; + continue; } if(reply.object()["class"].toString() == "chain_init") -- GitLab