X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcronhooks.php;h=d5b4f3bf6f1b4f07974f409f44d987f809a86854;hb=602821279a504752f15829afbe7eca848352d0c8;hp=48f157191679c7a9ef9cb355c5e56fc92dfe32b9;hpb=10b68ef8378a552a0e0483f01dc527f84f9c2127;p=friendica.git

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 48f1571916..d5b4f3bf6f 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -9,13 +9,13 @@ function cronhooks_run(&$argv, &$argc){
 	if(is_null($a)) {
 		$a = new App;
 	}
-  
+
 	if(is_null($db)) {
-	    @include(".htconfig.php");
-    	require_once("include/dba.php");
-	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
-    	unset($db_host, $db_user, $db_pass, $db_data);
-  	};
+		@include(".htconfig.php");
+		require_once("include/dba.php");
+		$db = new dba($db_host, $db_user, $db_pass, $db_data);
+		unset($db_host, $db_user, $db_pass, $db_data);
+	};
 
 	require_once('include/session.php');
 	require_once('include/datetime.php');
@@ -24,11 +24,42 @@ function cronhooks_run(&$argv, &$argc){
 	load_config('config');
 	load_config('system');
 
-	$lockpath = get_config('system','lockpath');
+	$maxsysload = intval(get_config('system','maxloadavg'));
+	if($maxsysload < 1)
+		$maxsysload = 50;
+	if(function_exists('sys_getloadavg')) {
+		$load = sys_getloadavg();
+		if(intval($load[0]) > $maxsysload) {
+			logger('system: load ' . $load[0] . ' too high. Cronhooks deferred to next scheduled run.');
+			return;
+		}
+	}
+
+	$last = get_config('system','last_cronhook');
+
+	$poll_interval = intval(get_config('system','cronhook_interval'));
+	if(! $poll_interval)
+		$poll_interval = 9;
+
+	if($last) {
+		$next = $last + ($poll_interval * 60);
+		if($next > time()) {
+			logger('cronhook intervall not reached');
+			return;
+		}
+	}
+
+	$lockpath = get_lockpath();
 	if ($lockpath != '') {
-		$pidfile = new pidfile($lockpath, 'cron.lck');
+		$pidfile = new pidfile($lockpath, 'cronhooks');
 		if($pidfile->is_already_running()) {
 			logger("cronhooks: Already running");
+			if ($pidfile->running_time() > 19*60) {
+				$pidfile->kill();
+				logger("cronhooks: killed stale process");
+				// Calling a new instance
+				proc_run('php','include/cronhooks.php');
+			}
 			exit;
 		}
 	}
@@ -38,17 +69,19 @@ function cronhooks_run(&$argv, &$argc){
 	load_hooks();
 
 	logger('cronhooks: start');
-echo("@@@ cronhooks start\n");
-	
 
 	$d = datetime_convert();
 
 	call_hooks('cron', $d);
 
+	logger('cronhooks: end');
+
+	set_config('system','last_cronhook', time());
+
 	return;
 }
 
 if (array_search(__file__,get_included_files())===0){
-  cronhooks_run($argv,$argc);
-  killme();
+	cronhooks_run($_SERVER["argv"],$_SERVER["argc"]);
+	killme();
 }