more spaces

[friendica.git] / include / discover_poco.php

diff --git a/include/discover_poco.php b/include/discover_poco.php
index 550c9897be9fb3daee861cdc9561ad70997486f0..10c741ae5f10aa78b0510ecdc9d2bdfe9567bc14 100644 (file)
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -1,9 +1,10 @@
 <?php
 
+use \Friendica\Core\Config;
+
 require_once("boot.php");
 require_once("include/socgraph.php");
 
-
 function discover_poco_run(&$argv, &$argc){
        global $a, $db;
 
@@ -20,25 +21,13 @@ function discover_poco_run(&$argv, &$argc){
 
        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") {
-               $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. discover_poco deferred to next scheduled run.');
-                               return;
-                       }
-               }
-       }
+       if (App::callstack() != "poller_run")
+               if ($a->maxload_reached())
+                       return;
 
        if(($argc > 2) && ($argv[1] == "dirsearch")) {
                $search = urldecode($argv[2]);
@@ -54,23 +43,9 @@ function discover_poco_run(&$argv, &$argc){
                die("Unknown or missing parameter ".$argv[1]."\n");
 
        // Don't check this stuff if the function is called by the poller
-       if (App::callstack() != "poller_run") {
-               $lockpath = get_lockpath();
-               if ($lockpath != '') {
-                       $pidfile = new pidfile($lockpath, 'discover_poco'.$mode.urlencode($search));
-                       if($pidfile->is_already_running()) {
-                               logger("discover_poco: Already running");
-                               if ($pidfile->running_time() > 19*60) {
-                                       $pidfile->kill();
-                                       logger("discover_poco: killed stale process");
-                                       // Calling a new instance
-                                       if ($mode == 0)
-                                               proc_run('php','include/discover_poco.php');
-                               }
-                               exit;
-                       }
-               }
-       }
+       if (App::callstack() != "poller_run")
+               if (App::is_already_running('discover_poco'.$mode.urlencode($search), 'include/discover_poco.php', 1140))
+                       return;
 
        $a->set_baseurl(get_config('system','url'));
 
@@ -211,6 +186,10 @@ function discover_directory($search) {
  */
 function gs_search_user($search) {
 
+       // Currently disabled, since the service isn't available anymore.
+       // It is not removed since I hope that there will be a successor.
+       return false;
+
        $a = get_app();
 
        $url = "http://gstools.org/api/users_search/".urlencode($search);