X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fcronhooks.php;h=72b86be427cc9f4dc034f5f64fb50aef5f4640a8;hb=43ceb721963fb7c303d26ef5a999a275144dd5c6;hp=096e10b718bd8ea51ff338f1b7a0bfa3e952c824;hpb=e746c4955bd9b8230d1c5427cfaeb18c6e370a3a;p=friendica.git

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 096e10b718..72b86be427 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -1,7 +1,8 @@
 <?php
 
-require_once("boot.php");
+use \Friendica\Core\Config;
 
+require_once("boot.php");
 
 function cronhooks_run(&$argv, &$argc){
 	global $a, $db;
@@ -9,48 +10,74 @@ 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');
-	require_once('include/pidfile.php');
 
-	load_config('config');
-	load_config('system');
+	Config::load();
+
+	// Don't check this stuff if the function is called by the poller
+	if (App::callstack() != "poller_run") {
+		if ($a->maxload_reached())
+			return;
+		if (App::is_already_running('cronhooks', 'include/cronhooks.php', 1140))
+			return;
+	}
+
+	load_hooks();
 
-	if ($hostname =  get_config('system', 'hostname'))
-		$a->set_hostname($hostname);
+	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;
+	}
 
-	$lockpath = get_config('system','lockpath');
-	if ($lockpath != '') {
-		$pidfile = new pidfile($lockpath, 'cron.lck');
-		if($pidfile->is_already_running()) {
-			logger("cronhooks: Already running");
-			exit;
+	$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;
 		}
 	}
 
 	$a->set_baseurl(get_config('system','url'));
 
-	load_hooks();
-
 	logger('cronhooks: start');
-	
 
 	$d = datetime_convert();
 
-	call_hooks('cron', $d);
+	if (get_config("system", "worker") AND 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]);
+		}
+	} else
+		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();
 }