From b28acc7dad3cc8f70ff1edb3d5dc8928899c520c Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 29 May 2021 11:11:26 +0000 Subject: [PATCH] Improved logging for local probing, avoid worker fork --- src/Model/Contact.php | 2 +- src/Model/Contact/Relation.php | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/Model/Contact.php b/src/Model/Contact.php index c3c75a8d4..aa6f4c75c 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -271,7 +271,7 @@ class Contact // Update the contact in the background if needed $updated = max($contact['success_update'], $contact['created'], $contact['updated'], $contact['last-update'], $contact['failure_update']); - if (($updated < DateTimeFormat::utc('now -7 days')) && in_array($contact['network'], Protocol::FEDERATED)) { + if (($updated < DateTimeFormat::utc('now -7 days')) && in_array($contact['network'], Protocol::FEDERATED) && !self::isLocalById($contact['id'])) { Worker::add(PRIORITY_LOW, "UpdateContact", $contact['id']); } diff --git a/src/Model/Contact/Relation.php b/src/Model/Contact/Relation.php index 66f272114..d9a38e8c3 100644 --- a/src/Model/Contact/Relation.php +++ b/src/Model/Contact/Relation.php @@ -87,10 +87,11 @@ class Relation $uid = User::getIdForURL($url); if (!empty($uid)) { - // Fetch the followers/followings locally + Logger::info('Fetch the followers/followings locally', ['url' => $url]); $followers = self::getContacts($uid, [Contact::FOLLOWER, Contact::FRIEND]); $followings = self::getContacts($uid, [Contact::SHARING, Contact::FRIEND]); - } else { + } elseif (!Contact::isLocal($url)) { + Logger::info('Fetch the followers/followings by polling the endpoints', ['url' => $url]); $apcontact = APContact::getByURL($url, false); if (!empty($apcontact['followers']) && is_string($apcontact['followers'])) { @@ -104,6 +105,10 @@ class Relation } else { $followings = []; } + } else { + Logger::notice('Contact seems to be local but could not be found here', ['url' => $url]); + $followers = []; + $followings = []; } if (empty($followers) && empty($followings)) {