proc_run was replaced

[friendica.git] / include / cronhooks.php

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 986a86dfbb8b3b7a219727c83a72a4ca1210916a..aa5d41afddee828d731cec49f8d8e42dfcbcf7bf 100644 (file)
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -1,85 +1,54 @@
 <?php
 
-require_once("boot.php");
+use Friendica\Core\Config;
+use Friendica\Core\Worker;
 
+function cronhooks_run(&$argv, &$argc) {
+       global $a;
 
-function cronhooks_run(&$argv, &$argc){
-       global $a, $db;
+       require_once 'include/datetime.php';
 
-       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);
-       };
-
-       $a->start_process();
-
-       require_once('include/session.php');
-       require_once('include/datetime.php');
-
-       load_config('config');
-       load_config('system');
-
-       // 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;
-       }
-
-       load_hooks();
-
-       if (($argc == 2) AND is_array($a->hooks) AND array_key_exists("cron", $a->hooks)) {
-                foreach ($a->hooks["cron"] as $hook)
+       if (($argc == 2) && is_array($a->hooks) && 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);
+                               logger("Calling cron hook '" . $hook[1] . "'", LOGGER_DEBUG);
                                call_single_hook($a, $name, $hook, $data);
                        }
+               }
                return;
        }
 
-       $last = get_config('system','last_cronhook');
+       $last = get_config('system', 'last_cronhook');
 
-       $poll_interval = intval(get_config('system','cronhook_interval'));
-       if(! $poll_interval)
+       $poll_interval = intval(get_config('system', 'cronhook_interval'));
+       if (! $poll_interval) {
                $poll_interval = 9;
+       }
 
-       if($last) {
+       if ($last) {
                $next = $last + ($poll_interval * 60);
-               if($next > time()) {
+               if ($next > time()) {
                        logger('cronhook intervall not reached');
                        return;
                }
        }
 
-       $a->set_baseurl(get_config('system','url'));
+       $a->set_baseurl(get_config('system', 'url'));
 
        logger('cronhooks: start');
 
        $d = datetime_convert();
 
-       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]);
+       if (is_array($a->hooks) && array_key_exists("cron", $a->hooks)) {
+               foreach ($a->hooks["cron"] as $hook) {
+                       logger("Calling cronhooks for '" . $hook[1] . "'", LOGGER_DEBUG);
+                       Worker::add(PRIORITY_MEDIUM, "cronhooks", $hook[1]);
                }
-       } else
-               call_hooks('cron', $d);
+       }
 
        logger('cronhooks: end');
 
-       set_config('system','last_cronhook', time());
+       set_config('system', 'last_cronhook', time());
 
        return;
 }
-
-if (array_search(__file__,get_included_files())===0){
-       cronhooks_run($_SERVER["argv"],$_SERVER["argc"]);
-       killme();
-}