github-starred/ultimatepp
2
0
Fork 0
mirror of https://github.com/ultimatepp/ultimatepp.git synced 2026-05-21 06:45:39 -06:00
Code Issues 33 Projects Packages Wiki Activity Actions

*Core/Rpc: Fixed fault reporting in JsonRpc

Browse source 
git-svn-id: svn://ultimatepp.org/upp/trunk@5214 f0d560ea-af0d-0410-9eb7-867de7ffcac7
This commit is contained in:
cxl 2012-07-18 09:51:47 +00:00
parent aca50d2d87
commit ca3873bd79
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
uppsrc/Core/Rpc/Server.cpp
View file

@ -176,13 +176,13 @@ Value ProcessJsonRpc(const Value& v, const char *group, const char *peeraddr)
LLOG("Processing error: " << e.text);
if(rpc_trace)
*rpc_trace << "Processing error: " << e.text << '\n';
return AsJSON(JsonRpcError(e.code, e.text, id));
return JsonRpcError(e.code, e.text, id);
}
catch(ValueTypeMismatch) {
LLOG("ValueTypeMismatch at parameter " << data.ii);
if(rpc_trace)
*rpc_trace << "ValueTypeMismatch at parameter " << data.ii << '\n';
return AsJSON(JsonRpcError(RPC_SERVER_PARAM_ERROR, "Invalid params", id));
return JsonRpcError(RPC_SERVER_PARAM_ERROR, "Invalid params", id);
}
}
@ -251,7 +251,7 @@ bool RpcPerform(TcpSocket& http, const char *group)
response <<
"HTTP/1.0 200 OK\r\n"
"Date: " << ts << "\r\n"
"Server: U++ XMLRPC server\r\n"
"Server: U++ RPC server\r\n"
"Content-Length: " << r.GetCount() << "\r\n"
"Connection: close\r\n"
"Content-Type: text/" << (json ? "json" : "xml") << "\r\n\r\n"