There is now a time limit when fetching AP endpoints

diff --git a/src/Core/Worker.php b/src/Core/Worker.php
index 7075b4b236f77c90974bd3b99c423ad03a5ae04b..c84b59e2b7324c5ec6838c3962706e3f306c54c9 100644 (file)
--- a/src/Core/Worker.php
+++ b/src/Core/Worker.php
@@ -601,7 +601,7 @@ class Worker
                $rest    = round(max(0, $up_duration - (self::$db_duration + self::$lock_duration)), 2);
                $exec    = round($duration, 2);
 
-               Logger::info('Performance:', ['state' => self::$state, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'lock' => $dblock, 'total' => $dbtotal, 'rest' => $rest, 'exec' => $exec]);
+               Logger::info('Performance:', ['function' => $funcname, 'state' => self::$state, 'count' => $dbcount, 'stat' => $dbstat, 'write' => $dbwrite, 'lock' => $dblock, 'total' => $dbtotal, 'rest' => $rest, 'exec' => $exec]);
 
                self::coolDown();
 
@@ -622,7 +622,7 @@ class Worker
                        Logger::info('Longer than 2 minutes.', ['priority' => $queue['priority'], 'id' => $queue['id'], 'duration' => round($duration/60, 3)]);
                }
 
-               Logger::info('Process done.', ['priority' => $queue['priority'], 'id' => $queue['id'], 'duration' => round($duration, 3)]);
+               Logger::info('Process done.', ['function' => $funcname, 'priority' => $queue['priority'], 'retrial' => $queue['retrial'], 'id' => $queue['id'], 'duration' => round($duration, 3)]);
 
                DI::profiler()->saveLog(DI::logger(), 'ID ' . $queue['id'] . ': ' . $funcname);
        }

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 4be88b341b98c2d535ab9cbcb73e86e5b9bcdab2..11359b339a4e22d7b6a0ef303d31285620eaec02 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -241,12 +241,20 @@ class ActivityPub
        /**
         * Fetch items from AP endpoints
         *
-        * @param string $url  Address of the endpoint
-        * @param integer $uid Optional user id
+        * @param string $url        Address of the endpoint
+        * @param integer $uid       Optional user id
+        * @param integer $timestamp Internally used parameter to stop fetching after some time
         * @return array Endpoint items
         */
-       public static function fetchItems(string $url, int $uid = 0): array
+       public static function fetchItems(string $url, int $uid = 0, int $timestamp = 0): array
        {
+               $timestamp = $timestamp ?: time();
+
+               if ((time() - $timestamp) > 60) {
+                       Logger::info('Fetch time limit reached', ['url' => $url, 'uid' => $uid]);
+                       return [];
+               }
+
                $data = self::fetchContent($url, $uid);
                if (empty($data)) {
                        return [];
@@ -257,13 +265,13 @@ class ActivityPub
                } elseif (!empty($data['first']['orderedItems'])) {
                        $items = $data['first']['orderedItems'];
                } elseif (!empty($data['first']) && is_string($data['first']) && ($data['first'] != $url)) {
-                       return self::fetchItems($data['first'], $uid);
+                       return self::fetchItems($data['first'], $uid, $timestamp);
                } else {
                        return [];
                }
 
                if (!empty($data['next']) && is_string($data['next'])) {
-                       $items = array_merge($items, self::fetchItems($data['next'], $uid));
+                       $items = array_merge($items, self::fetchItems($data['next'], $uid, $timestamp));
                }
 
                return $items;