Merge remote-tracking branch 'upstream/2019.12-rc' into poco-cleanup

[friendica.git] / src / Protocol / PortableContact.php

diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php
index 228a96762cf718810ea25e136cbbf80192c6b552..1870f8f9b76b290fafaaa88395279defc9450852 100644 (file)
--- a/src/Protocol/PortableContact.php
+++ b/src/Protocol/PortableContact.php
@@ -57,7 +57,7 @@ class PortableContact
        public static function loadWorker($cid, $uid = 0, $zcid = 0, $url = null)
        {
                // Call the function "load" via the worker
-               Worker::add(PRIORITY_LOW, "DiscoverPoCo", "load", (int)$cid, (int)$uid, (int)$zcid, $url);
+               Worker::add(PRIORITY_LOW, 'FetchPoCo', (int)$cid, (int)$uid, (int)$zcid, $url);
        }
 
        /**
@@ -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);
                                        }
                                }
                        }
@@ -488,7 +488,7 @@ class PortableContact
                                }
 
                                Logger::log('Update directory from server ' . $gserver['url'] . ' with ID ' . $gserver['id'], Logger::DEBUG);
-                               Worker::add(PRIORITY_LOW, 'DiscoverPoCo', 'update_server_directory', (int) $gserver['id']);
+                               Worker::add(PRIORITY_LOW, 'UpdateServerDirectory', (int)$gserver['id']);
 
                                if (!$complete && ( --$no_of_queries == 0)) {
                                        break;