From e5546dd40ae6a78f4b5e213941884885e7c48eb7 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 20 Dec 2019 21:12:44 +0000
Subject: [PATCH] "UpdateServers" added

---
 src/Worker/Cron.php          |  2 +-
 src/Worker/DiscoverPoCo.php  | 30 ---------------------------
 src/Worker/UpdateServers.php | 40 ++++++++++++++++++++++++++++++++++++
 3 files changed, 41 insertions(+), 31 deletions(-)
 create mode 100644 src/Worker/UpdateServers.php

diff --git a/src/Worker/Cron.php b/src/Worker/Cron.php
index 011fa46291..356be46e44 100644
--- a/src/Worker/Cron.php
+++ b/src/Worker/Cron.php
@@ -73,7 +73,7 @@ class Cron
 			// update nodeinfo data
 			Worker::add(PRIORITY_LOW, "CronJobs", "nodeinfo");
 
-			Worker::add(PRIORITY_LOW, "DiscoverPoCo", "update_server");
+			Worker::add(PRIORITY_LOW, 'UpdateServers');
 
 			Worker::add(PRIORITY_LOW, 'UpdateSuggestions');
 
diff --git a/src/Worker/DiscoverPoCo.php b/src/Worker/DiscoverPoCo.php
index 508914b48f..cd0968fd86 100644
--- a/src/Worker/DiscoverPoCo.php
+++ b/src/Worker/DiscoverPoCo.php
@@ -28,7 +28,6 @@ class DiscoverPoCo
 		This function can be called in these ways:
 		- checkcontact: Updates gcontact entries
 		- server <poco url>: Searches for the poco server list. "poco url" is base64 encoded.
-		- update_server: Frequently check the first 250 servers for vitality.
 		- PortableContact::load: Load POCO data from a given POCO address
 		*/
 
@@ -51,8 +50,6 @@ class DiscoverPoCo
 				$result .= "failed";
 			}
 			Logger::log($result, Logger::DEBUG);
-		} elseif ($command == "update_server") {
-			self::updateServer();
 		} elseif ($command == "load") {
 			if (!empty($param4)) {
 				$url = $param4;
@@ -81,31 +78,4 @@ class DiscoverPoCo
 
 		return;
 	}
-
-	/**
-	 * @brief Updates the first 250 servers
-	 *
-	 */
-	private static function updateServer() {
-		$r = q("SELECT `url`, `created`, `last_failure`, `last_contact` FROM `gserver` ORDER BY rand()");
-
-		if (!DBA::isResult($r)) {
-			return;
-		}
-
-		$updated = 0;
-
-		foreach ($r AS $server) {
-			if (!PortableContact::updateNeeded($server["created"], "", $server["last_failure"], $server["last_contact"])) {
-				continue;
-			}
-			Logger::log('Update server status for server '.$server["url"], Logger::DEBUG);
-
-			Worker::add(PRIORITY_LOW, "DiscoverPoCo", "server", $server["url"]);
-
-			if (++$updated > 250) {
-				return;
-			}
-		}
-	}
 }
diff --git a/src/Worker/UpdateServers.php b/src/Worker/UpdateServers.php
new file mode 100644
index 0000000000..a8248db458
--- /dev/null
+++ b/src/Worker/UpdateServers.php
@@ -0,0 +1,40 @@
+<?php
+/**
+ * @file src/Worker/UpdateServers.php
+ */
+namespace Friendica\Worker;
+
+use Friendica\Core\Logger;
+use Friendica\Core\Worker;
+use Friendica\Database\DBA;
+use Friendica\Protocol\PortableContact;
+
+class UpdateServers
+{
+	/**
+	 * @brief Updates the first 250 servers
+	 *
+	 */
+	public static function execute()
+	{
+		$gservers = DBA::select("SELECT `url`, `created`, `last_failure`, `last_contact` FROM `gserver` ORDER BY rand()");
+		if (!DBA::isResult($gservers)) {
+			return;
+		}
+
+		$updated = 0;
+
+		while ($gserver == DBA::fetch($gservers)) {
+			if (!PortableContact::updateNeeded($gserver['created'], '', $gserver['last_failure'], $gserver['last_contact'])) {
+				continue;
+			}
+			Logger::info('Update server status', ['server' => $gserver['url']]);
+
+			Worker::add(PRIORITY_LOW, 'DiscoverPoCo', 'server', $gserver['url']);
+
+			if (++$updated > 250) {
+				return;
+			}
+		}
+	}
+}