diff --git a/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp b/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp index c5200b766..065520b0a 100644 --- a/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp +++ b/login_server/src/cpp/SingletonManager/PendingTasksManager.cpp @@ -42,6 +42,7 @@ int PendingTasksManager::addTask(Poco::AutoPtr task) if (task.isNull() || !task->getModel()) { return -1; } + auto model = task->getModel(); Poco::ScopedLock _lock(mWorkMutex); auto pending_task_list = getTaskListForUser(model->getUserId()); @@ -235,30 +236,3 @@ Poco::AutoPtr PendingTasksManager::getPendingTask(int p return nullptr; } - -void PendingTasksManager::reportErrorToCommunityServer(Poco::AutoPtr task, std::string error, std::string errorDetails) -{ - // TODO: choose user specific server - JsonRequest phpServerRequest(ServerConfig::g_php_serverHost, ServerConfig::g_phpServerPort); - //Poco::Net::NameValueCollection payload; - Poco::JSON::Object payload; - - auto task_model = task->getModel(); - auto user_model = task->getUser()->getModel(); - - payload.set("created", task_model->getCreated()); - payload.set("id", task_model->getID()); - payload.set("type", task_model->getTaskTypeString()); - payload.set("public_key", user_model->getPublicKeyHex()); - payload.set("error", error); - payload.set("errorMessage", errorDetails); - - auto ret = phpServerRequest.request("errorInTransaction", payload); - if (ret == JSON_REQUEST_RETURN_ERROR) - { - auto em = ErrorManager::getInstance(); - em->addError(new Error("PendingTasksManager::reportErrorToCommunityServer", "php server error")); - em->getErrors(&phpServerRequest); - em->sendErrorsAsEmail(); - } -} diff --git a/login_server/src/cpp/SingletonManager/PendingTasksManager.h b/login_server/src/cpp/SingletonManager/PendingTasksManager.h index 8444f32ea..2ee96266a 100644 --- a/login_server/src/cpp/SingletonManager/PendingTasksManager.h +++ b/login_server/src/cpp/SingletonManager/PendingTasksManager.h @@ -50,7 +50,6 @@ public: std::vector> getTransactionsUserMustSign(Poco::AutoPtr user); std::vector> getTransactionSomeoneMustSign(Poco::AutoPtr user); - void reportErrorToCommunityServer(Poco::AutoPtr task, std::string error, std::string errorDetails); protected: PendingTasksManager(); diff --git a/login_server/src/cpp/model/gradido/Transaction.cpp b/login_server/src/cpp/model/gradido/Transaction.cpp index 404d4f747..67e6137a2 100644 --- a/login_server/src/cpp/model/gradido/Transaction.cpp +++ b/login_server/src/cpp/model/gradido/Transaction.cpp @@ -358,6 +358,8 @@ namespace model { } //UniLib::controller::TaskPtr transaction_send_task(new SendTransactionTask(Poco::AutoPtr(this, true))); //transaction_send_task->scheduleTask(transaction_send_task); + auto pt = PendingTasksManager::getInstance(); + pt->removeTask(this); return 1 == runSendTransaction(); //return true; } @@ -507,9 +509,6 @@ namespace model { addError(new ParamError(function_name, "unknown error", TransactionValidationToString(result))); //sendErrorsAsEmail(); } - - auto pt = PendingTasksManager::getInstance(); - pt->reportErrorToCommunityServer(Poco::AutoPtr(this, true), error_name, error_description); addError(new ParamError(function_name, error_name, error_description)); } return -1;