RanchiMall/php-mpos
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #840 from TheSerapher/issue-839

Browse Source 
[FIX] Skip uptime robot with defaults set
This commit is contained in:
Sebastian Grewe 2013-11-11 01:02:49 -08:00
commit 4378fc1a87
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cronjobs/tickerupdate.php
View File

@ -28,6 +28,7 @@ require_once('shared.inc.php');
// Include additional file not set in autoloader // Include additional file not set in autoloader
require_once(CLASS_DIR . '/tools.class.php'); require_once(CLASS_DIR . '/tools.class.php');
// Fetch latest coin price via API call
if ($price = $tools->getPrice()) { if ($price = $tools->getPrice()) {
$log->logDebug("Price update: found $price as price"); $log->logDebug("Price update: found $price as price");
if (!$setting->setValue('price', $price)) if (!$setting->setValue('price', $price))
@ -36,14 +37,15 @@ if ($price = $tools->getPrice()) {
$log->logError("failed to fetch API data: " . $tools->getCronError()); $log->logError("failed to fetch API data: " . $tools->getCronError());
} }
if ($setting->getValue('monitoring_uptimerobot_private_key')) { // Update Uptime Robot status in Settings table via API call
if ($api_keys = $setting->getValue('monitoring_uptimerobot_api_keys') && strstr($api_keys, '<API KEY>|<MONITOR ID>')) {
$monitoring->setTools($tools); $monitoring->setTools($tools);
if (!$monitoring->storeUptimeRobotStatus()) { if (!$monitoring->storeUptimeRobotStatus()) {
$log->logError($monitoring->getCronError()); $log->logError($monitoring->getCronError());
$monitoring->endCronjob($cron_name, 'E0017', 1, true); $monitoring->endCronjob($cron_name, 'E0017', 1, false);
} }
} else { } else {
$log->logDebug('Skipped Uptime Robot API update, missing private key'); $log->logDebug('Skipped Uptime Robot API update, missing api keys');
} }
require_once('cron_end.inc.php'); require_once('cron_end.inc.php');

2
public/include/classes/monitoring.class.php
View File

@ -12,7 +12,7 @@ class Monitoring extends Base {
* @return bool true on success, false on error * @return bool true on success, false on error
**/ **/
public function storeUptimeRobotStatus() { public function storeUptimeRobotStatus() {
if ($api_keys = $this->setting->getValue('monitoring_uptimerobot_private_key')) { if ($api_keys = $this->setting->getValue('monitoring_uptimerobot_api_keys')) {
$aJSONData = array(); $aJSONData = array();
$url = 'http://api.uptimerobot.com'; $url = 'http://api.uptimerobot.com';
$aMonitors = explode(',', $api_keys); $aMonitors = explode(',', $api_keys);

4
public/include/config/admin_settings.inc.php
View File

@ -280,9 +280,9 @@ $aSettings['recaptcha'][] = array(
); );
$aSettings['monitoring'][] = array( $aSettings['monitoring'][] = array(
'display' => 'Uptime Robot Private API Key', 'type' => 'text', 'display' => 'Uptime Robot Private API Key', 'type' => 'text',
'size' => 25, 'size' => 100,
'default' => '<API KEY>|<MONITOR ID>,<API KEY>|<MONITOR ID>, ...', 'default' => '<API KEY>|<MONITOR ID>,<API KEY>|<MONITOR ID>, ...',
'name' => 'monitoring_uptimerobot_private_key', 'value' => $setting->getValue('monitoring_uptimerobot_private_key'), 'name' => 'monitoring_uptimerobot_api_keys', 'value' => $setting->getValue('monitoring_uptimerobot_api_keys'),
'tooltip' => 'Create per-monitor API keys and save them here to propagate your uptime statistics.' 'tooltip' => 'Create per-monitor API keys and save them here to propagate your uptime statistics.'
); );