From a9a9f7d51d4c0f3d8d83028179ea6cc394260e92 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 1 Aug 2020 08:56:07 +0000 Subject: [PATCH] Update the last query at a single place --- src/Model/GServer.php | 9 +++++---- src/Protocol/PortableContact.php | 7 ------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/Model/GServer.php b/src/Model/GServer.php index 9a8166158..07a5eaad3 100644 --- a/src/Model/GServer.php +++ b/src/Model/GServer.php @@ -1607,11 +1607,12 @@ class GServer Logger::info('Update peer list', ['server' => $gserver['url'], 'id' => $gserver['id']]); Worker::add(PRIORITY_LOW, 'UpdateServerPeers', $gserver['url']); - if ($gserver['directory-type'] == self::DT_POCO) { - Logger::info('Update directory', ['server' => $gserver['url'], 'id' => $gserver['id']]); - Worker::add(PRIORITY_LOW, 'UpdateServerDirectory', $gserver); - } + Logger::info('Update directory', ['server' => $gserver['url'], 'id' => $gserver['id']]); + Worker::add(PRIORITY_LOW, 'UpdateServerDirectory', $gserver); + $fields = ['last_poco_query' => DateTimeFormat::utcNow()]; + DBA::update('gserver', $fields, ['nurl' => $gserver['nurl']]); + if (--$no_of_queries == 0) { break; } diff --git a/src/Protocol/PortableContact.php b/src/Protocol/PortableContact.php index cfc140d66..8109ef237 100644 --- a/src/Protocol/PortableContact.php +++ b/src/Protocol/PortableContact.php @@ -330,18 +330,11 @@ class PortableContact } } - $fields = ['last_poco_query' => DateTimeFormat::utcNow()]; - DBA::update('gserver', $fields, ['nurl' => $server["nurl"]]); - return true; } else { // If the server hadn't replied correctly, then force a sanity check GServer::check($server["url"], $server["network"], true); - // If we couldn't reach the server, we will try it some time later - $fields = ['last_poco_query' => DateTimeFormat::utcNow()]; - DBA::update('gserver', $fields, ['nurl' => $server["nurl"]]); - return false; } }