From e49802c9bcc4bed8f1268e723eee850fb7bf4f58 Mon Sep 17 00:00:00 2001 From: einhornimmond Date: Wed, 3 Mar 2021 14:50:21 +0100 Subject: [PATCH] fix naming (differ from community server), enable back request transactions from gn --- src/cpp/JSONInterface/JsonGetLogin.cpp | 6 +++--- src/cpp/SingletonManager/CronManager.cpp | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/cpp/JSONInterface/JsonGetLogin.cpp b/src/cpp/JSONInterface/JsonGetLogin.cpp index cf97302c2..65638bf37 100644 --- a/src/cpp/JSONInterface/JsonGetLogin.cpp +++ b/src/cpp/JSONInterface/JsonGetLogin.cpp @@ -76,17 +76,17 @@ Poco::JSON::Object* JsonGetLogin::handle(Poco::Dynamic::Var params) int pending = 0; auto user_must_sign = pt->getTransactionsUserMustSign(userNew); pending = user_must_sign.size(); - result->set("Transaction.pending", pending); + result->set("Transactions.pending", pending); auto some_must_sign = pt->getTransactionSomeoneMustSign(userNew); //pending = some_must_sign.size(); - result->set("Transaction.can_signed", some_must_sign.size()); + result->set("Transactions.can_signed", some_must_sign.size()); auto executing = observer->getTaskCount(userModel->getEmail(), TASK_OBSERVER_SIGN_TRANSACTION); if (executing < 0) { executing = 0; } - result->set("Transaction.executing", executing); + result->set("Transactions.executing", executing); //printf("pending: %d\n", session->getProcessingTransactionCount()); //std::string user_string = userModel->toString(); //printf("[JsonGetLogin] %s\n", user_string.data()); diff --git a/src/cpp/SingletonManager/CronManager.cpp b/src/cpp/SingletonManager/CronManager.cpp index f3eae73a6..893cb7040 100644 --- a/src/cpp/SingletonManager/CronManager.cpp +++ b/src/cpp/SingletonManager/CronManager.cpp @@ -193,8 +193,8 @@ int PingServerTask::run() std::string url_port = mNodeServer->getModel()->getUrlWithPort(); printf("%s [PingServerTask::run] call update for %s\n", Poco::DateTimeFormatter::format(current, "%d.%m.%y %H:%M:%S.%i").data(), url_port.data()); - //auto json_request = mNodeServer->createJsonRequest(); - //json_request.request("updateReadNode"); + auto json_request = mNodeServer->createJsonRequest(); + json_request.request("updateReadNode"); } return 0; } \ No newline at end of file