status-im/realm-js
2
0
Fork 0
mirror of https://github.com/status-im/realm-js.git synced 2025-01-22 20:41:18 +00:00
Code Issues Projects Releases Wiki Activity

Fix RPC server to include exception message

Browse Source
This commit is contained in:
blagoev 2017-10-02 11:15:28 +03:00
parent aaabc1e286
commit b8fc18e7e9
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/browser/rpc.js
View File

@ -248,6 +248,10 @@ function sendRequest(command, data, host = sessionHost) {
} }
else if (error.type && error.type == 'dict') { else if (error.type && error.type == 'dict') {
let responseError = deserialize_json_value(error); let responseError = deserialize_json_value(error);
if (response.message && response.message !== '') {
responseError.message = response.message;
}
throw responseError; throw responseError;
} }

3
src/rpc.cpp
View File

@ -371,8 +371,7 @@ json RPCServer::perform_request(std::string name, const json &args) {
catch (...) { catch (...) {
exceptionAsJson = {{"error", "An exception occured while processing the request. Could not serialize the exception as JSON"}}; exceptionAsJson = {{"error", "An exception occured while processing the request. Could not serialize the exception as JSON"}};
} }
return (json){{"error", exceptionAsJson}, {"message", ex.what()}};
return (json){{"error", exceptionAsJson}};
} }
catch (std::exception &exception) { catch (std::exception &exception) {
return (json){{"error", exception.what()}}; return (json){{"error", exception.what()}};