rework autocomplete: use minified version + delete old fk.autocomplete.js

[friendica.git] / include / cronhooks.php

diff --git a/include/cronhooks.php b/include/cronhooks.php
index 71cb0fb7b2f44a72caad66ecde5eb29f84cbc6c2..b6cf0e72378763d6b3e5ac697672dce67438ea02 100644 (file)
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -19,39 +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');
 
        // Don't check this stuff if the function is called by the poller
        if (App::callstack() != "poller_run") {
-               $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.');
-                               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;
-                       }
-               }
+               if (App::maxload_reached())
+                       return;
+               if (App::is_already_running('cronhooks', 'include/cronhooks.php', 1140))
+                       return;
        }
 
        $last = get_config('system','last_cronhook');