tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve error handling for JSON-RPC calls 

refs #5450
This commit is contained in:
Gunnar Beutner 2017-08-30 15:12:24 +02:00
parent a8cc0a601b
commit 440f848c7c
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
lib/remote/jsonrpcconnection.cpp
View File

@ -202,7 +202,12 @@ void JsonRpcConnection::MessageHandler(const String& jsonString)
ApiCallbackInfo aci = it->second;
m_ApiCallbacks.erase(it);
aci.Callback(message);
try {
aci.Callback(message);
} catch (const std::exception& ex) {
Log(LogWarning, "JsonRpcConnection")
<< "Error while processing message for identity '" << m_Identity << "'\n" << DiagnosticInformation(ex);
}
return;
}
@ -223,11 +228,10 @@ void JsonRpcConnection::MessageHandler(const String& jsonString)
resultMessage->Set("result", afunc->Invoke(origin, message->Get("params")));
} catch (const std::exception& ex) {
/* TODO: Add a user readable error message for the remote caller */
resultMessage->Set("error", DiagnosticInformation(ex));
std::ostringstream info;
info << "Error while processing message for identity '" << m_Identity << "'";
String diagInfo = DiagnosticInformation(ex);
resultMessage->Set("error", diagInfo);
Log(LogWarning, "JsonRpcConnection")
<< info.str() << "\n" << DiagnosticInformation(ex);
<< "Error while processing message for identity '" << m_Identity << "'\n" << diagInfo;
}
if (message->Contains("id")) {