Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FC Updates from BitShares and myself #21

Closed
nathanielhourt wants to merge 687 commits from dapp-support into latest-fc
pull from: dapp-support
merge into: Peerplays_Blockchain:latest-fc
Conversation 4 Commits 687 Files changed 314 +7 -3
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 15d751c3d0 - Show all commits

10
src/rpc/websocket_api.cpp
View file

@ -125,14 +125,18 @@ std::string websocket_api_connection::on_message(
auto end = time_point::now(); auto end = time_point::now();
if( end - start > fc::milliseconds( LOG_LONG_API_MAX_MS ) ) if( end - start > fc::milliseconds( LOG_LONG_API_MAX_MS ) )
elog( "API call execution time limit exceeded. method: ${m} params: ${p} time: ${t}", ("m",call.method)("p",call.params)("t", end - start) ); elog( "API call execution time limit exceeded. method: ${m} params: ${p} time: ${t}",
("m",call.method)("p",call.params)("t", end - start) );
else if( end - start > fc::milliseconds( LOG_LONG_API_WARN_MS ) ) else if( end - start > fc::milliseconds( LOG_LONG_API_WARN_MS ) )
wlog( "API call execution time nearing limit. method: ${m} params: ${p} time: ${t}", ("m",call.method)("p",call.params)("t", end - start) ); wlog( "API call execution time nearing limit. method: ${m} params: ${p} time: ${t}",
("m",call.method)("p",call.params)("t", end - start) );
#endif #endif
if( call.id ) if( call.id )
{ {
auto reply = fc::json::to_string( response( *call.id, result, "2.0" ), fc::json::stringify_large_ints_and_doubles, _max_conversion_depth ); auto reply = fc::json::to_string( response( *call.id, result, "2.0" ),
fc::json::stringify_large_ints_and_doubles,
_max_conversion_depth );
if( send_message && _connection ) if( send_message && _connection )
_connection->send_message( reply ); _connection->send_message( reply );
return reply; return reply;