add note message when continuing an existing queue (#16765)

* add note message when continuing an existing queue

* move message

* check if method exists

3 files changed, 24 insertions, 1 deletions

diff --git a/core/CronArchive.php b/core/CronArchive.php
index cc7d228c63..477720a892 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -303,6 +303,12 @@ class CronArchive
         $this->allWebsites = $websitesIds;
         $this->websiteIdArchiveList = $this->makeWebsiteIdArchiveList($websitesIds);
 
+        if (method_exists($this->websiteIdArchiveList, 'isContinuingPreviousRun') &&
+            $this->websiteIdArchiveList->isContinuingPreviousRun()
+        ) {
+            $this->logger->info("- Continuing ongoing archiving run by pulling from shared idSite queue.");
+        }
+
         if ($this->archiveFilter) {
             $this->archiveFilter->logFilterInfo($this->logger);
         }
@@ -336,7 +342,6 @@ class CronArchive
             return;
         }
 
-
         $this->logger->debug("Applying queued rearchiving...");
         $this->invalidator->applyScheduledReArchiving();
 
diff --git a/core/CronArchive/FixedSiteIds.php b/core/CronArchive/FixedSiteIds.php
index 041068b717..5aefab1a24 100644
--- a/core/CronArchive/FixedSiteIds.php
+++ b/core/CronArchive/FixedSiteIds.php
@@ -62,4 +62,12 @@ class FixedSiteIds
 
         return null;
     }
+
+    /**
+     * @return bool
+     */
+    public function isContinuingPreviousRun(): bool
+    {
+        return false;
+    }
 }
diff --git a/core/CronArchive/SharedSiteIds.php b/core/CronArchive/SharedSiteIds.php
index e070857bd4..cb880f579e 100644
--- a/core/CronArchive/SharedSiteIds.php
+++ b/core/CronArchive/SharedSiteIds.php
@@ -30,6 +30,7 @@ class SharedSiteIds
     private $currentSiteId;
     private $done = false;
     private $numWebsitesLeftToProcess;
+    private $isContinuingPreviousRun = false;
 
     public function __construct($websiteIds, $optionName = self::OPTION_DEFAULT)
     {
@@ -46,6 +47,7 @@ class SharedSiteIds
             $existingWebsiteIds = $self->getAllSiteIdsToArchive();
 
             if (!empty($existingWebsiteIds)) {
+                $this->isContinuingPreviousRun = true;
                 return $existingWebsiteIds;
             }
 
@@ -199,4 +201,12 @@ class SharedSiteIds
     {
         return Process::isSupported();
     }
+
+    /**
+     * @return bool
+     */
+    public function isContinuingPreviousRun(): bool
+    {
+        return $this->isContinuingPreviousRun;
+    }
 }