From ece8b3adf6d94133f3865783ac7291d88685fecc Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Thu, 23 Jan 2014 10:29:01 +0000 Subject: [PATCH 1/2] Create getcronjobstatus.inc.php --- .../pages/api/getcronjobstatus.inc.php | 56 +++++++++++++++++++ 1 file changed, 56 insertions(+) create mode 100644 public/include/pages/api/getcronjobstatus.inc.php diff --git a/public/include/pages/api/getcronjobstatus.inc.php b/public/include/pages/api/getcronjobstatus.inc.php new file mode 100644 index 00000000..1342a419 --- /dev/null +++ b/public/include/pages/api/getcronjobstatus.inc.php @@ -0,0 +1,56 @@ +isActive(); + +// Check user token +$user_id = $api->checkAccess($user->checkApiKey($_REQUEST['api_key']), @$_REQUEST['id']); + +if (!$user->isAdmin($user_id)) { + die("404 Page not found"); +} + +// Default crons to monitor +$aCrons = array('statistics','payouts','token_cleanup','archive_cleanup','blockupdate','findblock','notifications','tickerupdate','liquid_payout'); + +// Special cases, only add them if activated +switch ($config['payout_system']) { +case 'pplns': + $aCrons[] = $config['payout_system'] . '_payout'; + break; +case 'pps': + $aCrons[] = $config['payout_system'] . '_payout'; + break; +case 'prop': + $aCrons[] = 'proportional_payout'; + break; +} + +// Data array for template +foreach ($aCrons as $strCron) { + $aCronStatus[$strCron] = array( + 'disabled' => $monitoring->getStatus($strCron . '_disabled'), + 'exit' => $monitoring->getStatus($strCron . '_status'), + 'active' => $monitoring->getStatus($strCron . '_active'), + 'runtime' => $monitoring->getStatus($strCron . '_runtime'), + 'starttime' => $monitoring->getStatus($strCron . '_starttime'), + 'endtime' => $monitoring->getStatus($strCron . '_endtime'), + 'message' => $monitoring->getStatus($strCron . '_message'), + ); +} +// Output JSON format +$data = array( + 'raw' => array( 'personal' => array( 'hashrate' => $dPersonalHashrate ), 'pool' => array( 'hashrate' => $dPoolHashrate ), 'network' => array( 'hashrate' => $dNetworkHashrate / 1000 ) ), + 'personal' => array ( 'hashrate' => $dPersonalHashrateAdjusted, 'sharerate' => $dPersonalSharerate, 'shares' => $aUserRoundShares), + 'pool' => array( 'hashrate' => $dPoolHashrateAdjusted, 'shares' => $aRoundShares ), + 'network' => array( 'hashrate' => $dNetworkHashrateAdjusted, 'difficulty' => $dDifficulty, 'block' => $iBlock ), +); +echo $api->get_json($data); + +// Supress master template +$supress_master = 1; + +?> From 6d7d3f20265d3e1075d1bd1dd9eb6839f98819e2 Mon Sep 17 00:00:00 2001 From: ahmedbodi Date: Thu, 23 Jan 2014 20:23:41 +0000 Subject: [PATCH 2/2] Update getcronjobstatus.inc.php --- public/include/pages/api/getcronjobstatus.inc.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/public/include/pages/api/getcronjobstatus.inc.php b/public/include/pages/api/getcronjobstatus.inc.php index 1342a419..8dab4f09 100644 --- a/public/include/pages/api/getcronjobstatus.inc.php +++ b/public/include/pages/api/getcronjobstatus.inc.php @@ -41,14 +41,7 @@ foreach ($aCrons as $strCron) { 'message' => $monitoring->getStatus($strCron . '_message'), ); } -// Output JSON format -$data = array( - 'raw' => array( 'personal' => array( 'hashrate' => $dPersonalHashrate ), 'pool' => array( 'hashrate' => $dPoolHashrate ), 'network' => array( 'hashrate' => $dNetworkHashrate / 1000 ) ), - 'personal' => array ( 'hashrate' => $dPersonalHashrateAdjusted, 'sharerate' => $dPersonalSharerate, 'shares' => $aUserRoundShares), - 'pool' => array( 'hashrate' => $dPoolHashrateAdjusted, 'shares' => $aRoundShares ), - 'network' => array( 'hashrate' => $dNetworkHashrateAdjusted, 'difficulty' => $dDifficulty, 'block' => $iBlock ), -); -echo $api->get_json($data); +echo $api->get_json($aCronStatus); // Supress master template $supress_master = 1;