"CheckServer" added

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 60844df9f70f1dc8540856a6cf3667fe261686d0..1870f8f9b76b290fafaaa88395279defc9450852 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -315,7 +315,7 @@ class PortableContact
 
                        if (!DBA::isResult($r)) {
                                Logger::log("Call server check for server ".$server_url, Logger::DEBUG);
-                               Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $server_url);
+                               Worker::add(PRIORITY_LOW, 'CheckServer', $server_url);
                        }
                }
        }
@@ -340,7 +340,7 @@ class PortableContact
 
                        if (!empty($servers['pods'])) {
                                foreach ($servers['pods'] as $server) {
-                                       Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", "https://" . $server['host']);
+                                       Worker::add(PRIORITY_LOW, 'CheckServer', 'https://' . $server['host']);
                                }
                        }
                }
@@ -359,7 +359,7 @@ class PortableContact
 
                                        foreach ($servers['instances'] as $server) {
                                                $url = (is_null($server['https_score']) ? 'http' : 'https') . '://' . $server['name'];
-                                               Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $url);
+                                               Worker::add(PRIORITY_LOW, 'CheckServer', $url);
                                        }
                                }
                        }

diff --git a/src/Worker/CheckServer.php b/src/Worker/CheckServer.php
new file mode 100644 (file)
index 0000000..d51b728
--- /dev/null
+++ b/src/Worker/CheckServer.php
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @file src/Worker/CheckServer.php
+ */
+namespace Friendica\Worker;
+
+use Friendica\Core\Logger;
+use Friendica\Model\GServer;
+use Friendica\Util\Strings;
+
+class CheckServer
+{
+       // Searches for the poco server list.
+       public static function execute($server_url)
+       {
+               if (empty($server_url)) {
+                       return;
+               }
+
+               $server_url = filter_var($server_url, FILTER_SANITIZE_URL);
+               if (substr(Strings::normaliseLink($server_url), 0, 7) != 'http://') {
+                       return;
+               }
+
+               $ret = GServer::check($server_url);
+               Logger::log('Checking server', ['url' => $server_url, 'result' => $ret]);
+       }
+}

diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index af486a6440f53d181d79fda74bec5b31275d6719..29b5d4f65764b29c1f1b02ccb7e3ce3eff00ccc6 100644 (file)
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -6,63 +6,23 @@ namespace Friendica\Worker;
 
 use Friendica\Core\Config;
 use Friendica\Core\Logger;
-use Friendica\Core\Protocol;
-use Friendica\Core\Worker;
-use Friendica\Database\DBA;
 use Friendica\Model\GContact;
-use Friendica\Model\Contact;
-use Friendica\Model\GServer;
 use Friendica\Protocol\PortableContact;
-use Friendica\Util\Strings;
 
 class DiscoverPoCo
 {
-       /// @todo Clean up this mess of a parameter hell and split it in several classes
-       public static function execute($command = '', $param1 = '', $param2 = '', $param3 = '', $param4 = '')
+       public static function execute()
        {
-               /*
-               This function can be called in these ways:
-               - server <poco url>: Searches for the poco server list. "poco url" is base64 encoded.
-               */
-
-               $search = "";
-               $mode = 0;
-               if ($command == "server") {
-                       $server_url = $param1;
-                       if ($server_url == "") {
-                               return;
-                       }
-                       $server_url = filter_var($server_url, FILTER_SANITIZE_URL);
-                       if (substr(Strings::normaliseLink($server_url), 0, 7) != "http://") {
-                               return;
-                       }
-                       $result = "Checking server ".$server_url." - ";
-                       $ret = GServer::check($server_url);
-                       if ($ret) {
-                               $result .= "success";
-                       } else {
-                               $result .= "failed";
-                       }
-                       Logger::log($result, Logger::DEBUG);
-               } elseif ($command !== "") {
-                       Logger::log("Unknown or missing parameter ".$command."\n");
+               if (Config::get('system', 'poco_discovery') == PortableContact::DISABLED) {
                        return;
                }
 
-               Logger::log('start '.$search);
-
-               if (($mode == 0) && ($search == "") && (Config::get('system', 'poco_discovery') != PortableContact::DISABLED)) {
-                       // Query Friendica and Hubzilla servers for their users
-                       PortableContact::discover();
+               // Query Friendica and Hubzilla servers for their users
+               PortableContact::discover();
 
-                       // Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server)
-                       if (!Config::get('system', 'ostatus_disabled')) {
-                               GContact::discoverGsUsers();
-                       }
+               // Query GNU Social servers for their users ("statistics" addon has to be enabled on the GS server)
+               if (!Config::get('system', 'ostatus_disabled')) {
+                       GContact::discoverGsUsers();
                }
-
-               Logger::log('end '.$search);
-
-               return;
        }
 }

diff --git a/src/Worker/UpdateServers.php b/src/Worker/UpdateServers.php
index 4d288f8fe2dee21ee3c1dcb26ed32f928b356ef6..d879c5f204b2e3ade02d8e91c457fb5e117d014e 100644 (file)
--- a/src/Worker/UpdateServers.php
+++ b/src/Worker/UpdateServers.php
@@ -30,7 +30,7 @@ class UpdateServers
                        }
                        Logger::info('Update server status', ['server' => $gserver['url']]);
 
-                       Worker::add(PRIORITY_LOW, 'DiscoverPoCo', 'server', $gserver['url']);
+                       Worker::add(PRIORITY_LOW, 'CheckServer', $gserver['url']);
 
                        if (++$updated > 250) {
                                return;