Standards

This commit is contained in:
Michael 2016-12-28 03:28:26 +00:00
parent 9f18d7e6de
commit bacb6b379b

View file

@ -16,11 +16,11 @@ require_once("boot.php");
function twitter_sync_run($argv, $argc){ function twitter_sync_run($argv, $argc){
global $a, $db; global $a, $db;
if(is_null($a)) { if (is_null($a)) {
$a = new App; $a = new App;
} }
if(is_null($db)) { if (is_null($db)) {
@include(".htconfig.php"); @include(".htconfig.php");
require_once("include/dba.php"); require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data); $db = new dba($db_host, $db_user, $db_pass, $db_data);
@ -31,11 +31,12 @@ function twitter_sync_run($argv, $argc){
require_once("include/pidfile.php"); require_once("include/pidfile.php");
$maxsysload = intval(get_config('system','maxloadavg')); $maxsysload = intval(get_config('system','maxloadavg'));
if($maxsysload < 1) if ($maxsysload < 1) {
$maxsysload = 50; $maxsysload = 50;
if(function_exists('sys_getloadavg')) { }
if (function_exists('sys_getloadavg')) {
$load = sys_getloadavg(); $load = sys_getloadavg();
if(intval($load[0]) > $maxsysload) { if (intval($load[0]) > $maxsysload) {
logger('system: load ' . $load[0] . ' too high. Twitter sync deferred to next scheduled run.'); logger('system: load ' . $load[0] . ' too high. Twitter sync deferred to next scheduled run.');
return; return;
} }
@ -52,7 +53,7 @@ function twitter_sync_run($argv, $argc){
$lockpath = get_lockpath(); $lockpath = get_lockpath();
if ($lockpath != '') { if ($lockpath != '') {
$pidfile = new pidfile($lockpath, 'twitter_sync-'.$mode.'-'.$uid); $pidfile = new pidfile($lockpath, 'twitter_sync-'.$mode.'-'.$uid);
if($pidfile->is_already_running()) { if ($pidfile->is_already_running()) {
logger("Already running"); logger("Already running");
if ($pidfile->running_time() > 9*60) { if ($pidfile->running_time() > 9*60) {
$pidfile->kill(); $pidfile->kill();