From 8c792dcf02424fce9b5a88c571c8f5c76295b710 Mon Sep 17 00:00:00 2001
From: diosmosis <diosmosis@users.noreply.github.com>
Date: Wed, 13 Jan 2021 00:04:21 -0800
Subject: Fix --skip-idsites regression and increment processed site count
 properly + add test. (#17081)

---
 core/CronArchive.php               | 2 +-
 core/CronArchive/QueueConsumer.php | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/CronArchive.php b/core/CronArchive.php
index 57e6ea259d..02b587838d 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -741,7 +741,7 @@ class CronArchive
         $websiteIds = array_intersect($websiteIds, $allWebsites);
 
         if (!empty($this->shouldSkipSpecifiedSites)) {
-            $websiteIds = array_intersect($websiteIds, $this->shouldSkipSpecifiedSites);
+            $websiteIds = array_diff($websiteIds, $this->shouldSkipSpecifiedSites);
         }
 
         /**
diff --git a/core/CronArchive/QueueConsumer.php b/core/CronArchive/QueueConsumer.php
index 10a2bcc1a8..54b2be9ed1 100644
--- a/core/CronArchive/QueueConsumer.php
+++ b/core/CronArchive/QueueConsumer.php
@@ -108,6 +108,8 @@ class QueueConsumer
      */
     private $currentSiteArchivingStartTime;
 
+    private $processedSiteCount = 0;
+
     public function __construct(LoggerInterface $logger, $websiteIdArchiveList, $countOfProcesses, $pid, Model $model,
                                 SegmentArchiving $segmentArchiving, CronArchive $cronArchive, RequestParser $cliMultiRequestParser,
                                 ArchiveFilter $archiveFilter = null)
@@ -138,6 +140,8 @@ class QueueConsumer
                 return null;
             }
 
+            ++$this->processedSiteCount;
+
             /**
              * This event is triggered before the cron archiving process starts archiving data for a single
              * site.
@@ -298,7 +302,7 @@ class QueueConsumer
 
             $this->logger->info("Finished archiving for site {idSite}, {requests} API requests, {timer} [{processed} / {totalNum} done]", [
                 'idSite' => $this->idSite,
-                'processed' => $this->websiteIdArchiveList->getNumProcessedWebsites(),
+                'processed' => $this->processedSiteCount,
                 'totalNum' => $this->websiteIdArchiveList->getNumSites(),
                 'timer' => $this->siteTimer,
                 'requests' => $this->siteRequests,
-- 
cgit v1.2.3