Without only the worker queue we don't need the deliverq anymore.

[friendica.git] / include / discover_poco.php

diff --git a/include/discover_poco.php b/include/discover_poco.php
index a8f670334b5d66a00d8fc5022d584472dfa85b80..0384483a40dd54e6fc89f6d4e37f39240ef150a7 100644 (file)
--- a/include/discover_poco.php
+++ b/include/discover_poco.php
@@ -1,43 +1,13 @@
 <?php
 
-require_once("boot.php");
-require_once("include/socgraph.php");
+use \Friendica\Core\Config;
 
+require_once('include/socgraph.php');
+require_once('include/datetime.php');
 
 function discover_poco_run(&$argv, &$argc){
-       global $a, $db;
 
-       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);
-       };
-
-       require_once('include/session.php');
-       require_once('include/datetime.php');
-       require_once('include/pidfile.php');
-
-       load_config('config');
-       load_config('system');
-
-       $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(($argc > 2) && ($argv[1] == "dirsearch")) {
+       if (($argc > 2) && ($argv[1] == "dirsearch")) {
                $search = urldecode($argv[2]);
                $mode = 1;
        } elseif(($argc == 2) && ($argv[1] == "checkcontact")) {
@@ -50,26 +20,6 @@ function discover_poco_run(&$argv, &$argc){
        } else
                die("Unknown or missing parameter ".$argv[1]."\n");
 
-       $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;
-               }
-       }
-
-       $a->set_baseurl(get_config('system','url'));
-
-       load_hooks();
-
        logger('start '.$search);
 
        if ($mode==3)
@@ -205,6 +155,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);
@@ -226,9 +180,3 @@ function gs_search_user($search) {
                }
        }
 }
-
-
-if (array_search(__file__,get_included_files())===0){
-  discover_poco_run($_SERVER["argv"],$_SERVER["argc"]);
-  killme();
-}