X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcronhooks.php;h=bea0f6a198a13121fc9df746b5e8db8cf8b3eddf;hb=fdcb6d3c6f785ea588f3ce7db2659764032c114d;hp=26cab3cf92a86a0c3a2b566f3d24dc56ed7e356c;hpb=a37f31b82fa72a5da70fc459a457fd1d88c9b035;p=friendica.git

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 26cab3cf92..bea0f6a198 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -1,71 +1,51 @@
 <?php
 
-require_once("boot.php");
-
+use \Friendica\Core\Config;
 
 function cronhooks_run(&$argv, &$argc){
-	global $a, $db;
+	global $a;
+
+	require_once('include/datetime.php');
 
-	if(is_null($a)) {
-		$a = new App;
+	if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
+                foreach ($a->hooks["cron"] as $hook)
+			if ($hook[1] == $argv[1]) {
+				logger("Calling cron hook '".$hook[1]."'", LOGGER_DEBUG);
+				call_single_hook($a, $name, $hook, $data);
+			}
+		return;
 	}
 
-	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);
-  	};
+	$last = get_config('system', 'last_cronhook');
 
-	require_once('include/session.php');
-	require_once('include/datetime.php');
-	require_once('include/pidfile.php');
+	$poll_interval = intval(get_config('system','cronhook_interval'));
+	if(! $poll_interval)
+		$poll_interval = 9;
 
-	load_config('config');
-	load_config('system');
-
-	$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.');
+	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, '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();
-
 	logger('cronhooks: start');
 
 	$d = datetime_convert();
 
-	call_hooks('cron', $d);
+	if (is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
+                foreach ($a->hooks["cron"] as $hook) {
+			logger("Calling cronhooks for '".$hook[1]."'", LOGGER_DEBUG);
+			proc_run(PRIORITY_MEDIUM, "include/cronhooks.php", $hook[1]);
+		}
+	}
 
 	logger('cronhooks: end');
 
-	return;
-}
+	set_config('system', 'last_cronhook', time());
 
-if (array_search(__file__,get_included_files())===0){
-  cronhooks_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
+	return;
 }