X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcronhooks.php;h=b6cf0e72378763d6b3e5ac697672dce67438ea02;hb=4b640dbd97b797bdf099b8b7e0492facb04086c9;hp=8c70008e453c913e9318184ed859e161ed68eb6a;hpb=8a5fada863364c729decea75c7b6e1549a7b81ce;p=friendica.git

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 8c70008e45..b6cf0e7237 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -19,21 +19,16 @@ function cronhooks_run(&$argv, &$argc){
 
 	require_once('include/session.php');
 	require_once('include/datetime.php');
-	require_once('include/pidfile.php');
 
 	load_config('config');
 	load_config('system');
 
-	$maxsysload = intval(get_config('system','maxloadavg'));
-	if($maxsysload < 1)
-		$maxsysload = 50;
-
-	$load = current_load();
-	if($load) {
-		if(intval($load) > $maxsysload) {
-			logger('system: load ' . $load . ' too high. Cronhooks deferred to next scheduled run.');
+	// Don't check this stuff if the function is called by the poller
+	if (App::callstack() != "poller_run") {
+		if (App::maxload_reached())
+			return;
+		if (App::is_already_running('cronhooks', 'include/cronhooks.php', 1140))
 			return;
-		}
 	}
 
 	$last = get_config('system','last_cronhook');
@@ -50,21 +45,6 @@ function cronhooks_run(&$argv, &$argc){
 		}
 	}
 
-	$lockpath = get_lockpath();
-	if ($lockpath != '') {
-		$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;
-		}
-	}
-
 	$a->set_baseurl(get_config('system','url'));
 
 	load_hooks();