From c7f952a27a2816bd45403a26f0dd46e8deadba70 Mon Sep 17 00:00:00 2001 From: Sebastian Grewe Date: Wed, 24 Jul 2013 09:12:29 +0200 Subject: [PATCH] Display network hashrate in public API Instead of 0 show the actual hashrate, still shows 0 if unable to connect to RPC server. Fixes #511 --- public/include/pages/api/public.inc.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/public/include/pages/api/public.inc.php b/public/include/pages/api/public.inc.php index 5a98367a..3fe69708 100644 --- a/public/include/pages/api/public.inc.php +++ b/public/include/pages/api/public.inc.php @@ -10,6 +10,9 @@ $api->isActive(); $aLastBlock = $block->getLast(); $aShares = $statistics->getRoundShares(); +// RPC Calls +$bitcoin->can_connect() === true ? $dNetworkHashrate = $bitcoin->query('getnetworkhashps') : $dNetworkHashrate = 0; + echo json_encode( array( 'pool_name' => $config['website']['name'], @@ -17,7 +20,7 @@ echo json_encode( 'workers' => $worker->getCountAllActiveWorkers(), 'shares_this_round' => $aShares['valid'], 'last_block' => $aLastBlock['height'], - 'network_hashrate' => '0' + 'network_hashrate' => $dNetworkHashrate ) );