diff --git a/CMakeLists.txt b/CMakeLists.txt index 4c03cd07dc4136c267a2e62fd4a91b5c7cc9d123..99146be5b03c390008cb0745b783ec163940db69 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 65f412858140cfbe9a944b96b48b74a02a7c62ee..763bc0c78f5acde0c1cfc73f4fddea7948ef916a 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 625ab913c7ee6731a7da0f9e7b2cfa2663d777d2..b5c275ff6decec40e1c74a19c7f7de2d859ac424 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")