Improved logging for local probing, avoid worker fork

diff --git a/src/Model/Contact.php b/src/Model/Contact.php
index c3c75a8d438ede705687c9fb9edd423889e283da..aa6f4c75c2f04b0014d84111aed391056b88774e 100644 (file)
--- 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 66f272114950e8952d7a5bea0962afb686fa33db..d9a38e8c3e89ef0b41c0f6921f394519661f402d 100644 (file)
--- 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)) {