IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

add try catch blocks to prevent login-server from crashing

Browse Source
This commit is contained in:
einhornimmond 2021-05-14 15:18:38 +02:00 committed by Ulf Gebhardt
parent 063da15977
commit 22ff220729
No known key found for this signature in database
GPG Key ID: 81308EFE29ABFEBD
2 changed files with 54 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
login_server/src/cpp/JSONInterface/JsonCreateTransaction.cpp
View File

@ -85,6 +85,7 @@ Poco::JSON::Object* JsonCreateTransaction::handle(Poco::Dynamic::Var params)
Poco::JSON::Object* JsonCreateTransaction::transfer(Poco::Dynamic::Var params)
{
static const char* function_name = "JsonCreateTransaction::transfer";
auto target_pubkey = getTargetPubkey(params);
if (!target_pubkey) {
return customStateError("not found", "receiver not found");
@ -126,20 +127,33 @@ Poco::JSON::Object* JsonCreateTransaction::transfer(Poco::Dynamic::Var params)
result = stateError("sender and receiver are the same");
}
if (!result) {
auto transaction = model::gradido::Transaction::createTransfer(sender_user, target_pubkey, mTargetGroup, amount, mMemo, mBlockchainType);
try {
auto transaction = model::gradido::Transaction::createTransfer(sender_user, target_pubkey, mTargetGroup, amount, mMemo, mBlockchainType);
if (mAutoSign) {
Poco::JSON::Array errors;
transaction->sign(user);
if (transaction->errorCount() > 0) {
errors.add(transaction->getErrorsArray());
}
if (mAutoSign) {
Poco::JSON::Array errors;
transaction->sign(user);
if (transaction->errorCount() > 0) {
errors.add(transaction->getErrorsArray());
}
if (errors.size() > 0) {
return stateError("error by signing transaction", errors);
if (errors.size() > 0) {
return stateError("error by signing transaction", errors);
}
}
}
catch (Poco::Exception& ex) {
NotificationList errors;
errors.addError(new ParamError(function_name, "poco exception: ", ex.displayText()));
errors.sendErrorsAsEmail();
return stateError("exception");
}
catch (std::exception& ex) {
NotificationList errors;
errors.addError(new ParamError(function_name, "std::exception: ", ex.what()));
errors.sendErrorsAsEmail();
return stateError("exception");
}
result = stateSuccess();
}
mm->releaseMemory(target_pubkey);
@ -147,6 +161,7 @@ Poco::JSON::Object* JsonCreateTransaction::transfer(Poco::Dynamic::Var params)
}
Poco::JSON::Object* JsonCreateTransaction::creation(Poco::Dynamic::Var params)
{
static const char* function_name = "JsonCreateTransaction::creation";
auto target_pubkey = getTargetPubkey(params);
if (!target_pubkey) {
return customStateError("not found", "receiver not found");
@ -205,11 +220,25 @@ Poco::JSON::Object* JsonCreateTransaction::creation(Poco::Dynamic::Var params)
}
if(!result) {
auto transaction = model::gradido::Transaction::createCreation(mReceiverUser, amount, target_date, mMemo, mBlockchainType);
if (mAutoSign) {
if (!transaction->sign(mSession->getNewUser())) {
return stateError("error by signing transaction", transaction);
try {
auto transaction = model::gradido::Transaction::createCreation(mReceiverUser, amount, target_date, mMemo, mBlockchainType);
if (mAutoSign) {
if (!transaction->sign(mSession->getNewUser())) {
return stateError("error by signing transaction", transaction);
}
}
}
catch (Poco::Exception& ex) {
NotificationList errors;
errors.addError(new ParamError(function_name, "poco exception: ", ex.displayText()));
errors.sendErrorsAsEmail();
return stateError("exception");
}
catch (std::exception& ex) {
NotificationList errors;
errors.addError(new ParamError(function_name, "std::exception: ", ex.what()));
errors.sendErrorsAsEmail();
return stateError("exception");
}
result = stateSuccess();

12
login_server/src/cpp/tasks/CPUShedulerThread.cpp
View File

@ -32,6 +32,8 @@ namespace UniLib {
int CPUShedulerThread::ThreadFunction()
{
Poco::Logger& errorLog = Poco::Logger::get("errorLog");
static const char* function_name = "CPUShedulerThread::ThreadFunction";
while(!mWaitingTask.isNull())
{
@ -53,7 +55,15 @@ namespace UniLib {
#endif
}
catch (Poco::NullPointerException& ex) {
printf("[CPUShedulerThread::ThreadFunction] Null Pointer Exception for Task type: %s\n", mWaitingTask->getResourceType());
//printf("[CPUShedulerThread::ThreadFunction] Null Pointer Exception for Task type: %s\n", mWaitingTask->getResourceType());
errorLog.error("[%s] Null Pointer Exception for Task type %s: %s", function_name, mWaitingTask->getResourceType(), ex.displayText());
}
catch (Poco::Exception& ex) {
errorLog.error("[%s] Exception for Task type %s: %s", function_name, mWaitingTask->getResourceType(), ex.displayText());
}
catch (std::exception& ex) {
std::string exception_message = ex.what();
errorLog.error("[%s] std::exception for task type %s: %s", function_name, mWaitingTask->getResourceType(), exception_message);
}
mWaitingTask = mParent->getNextUndoneTask(this);