Auto merge of #1642 - str4d:add-solver-rate-to-getmininginfo, r=str4d

Add getlocalsolps and getnetworksolps RPC calls, show them in getmininginfo
This commit is contained in:
zkbot
2016-12-09 03:18:23 +00:00
8 changed files with 116 additions and 12 deletions

View File

@@ -984,6 +984,9 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
CScheduler::Function serviceLoop = boost::bind(&CScheduler::serviceQueue, &scheduler);
threadGroup.create_thread(boost::bind(&TraceThread<CScheduler::Function>, "scheduler", serviceLoop));
// Count uptime
MarkStartTime();
if ((chainparams.NetworkIDString() != "regtest") &&
GetBoolArg("-showmetrics", isatty(STDOUT_FILENO)) &&
!fPrintToConsole && !GetBoolArg("-daemon", false)) {