diff --git a/core/CronArchive.php b/core/CronArchive.php index 401a58954300bb279f46e16fb5858f7201fb2da7..ec237e3025d45fa59fe0efbf4fdaf31989ef4e37 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -418,16 +418,16 @@ class CronArchive $this->logger->info("Archived today's reports for {$this->websitesWithVisitsSinceLastRun} websites"); $this->logger->info("Archived week/month/year for {$this->archivedPeriodsArchivesWebsite} websites"); $this->logger->info("Skipped {$this->skipped} websites"); - $this->logger->info("- Skipped {$this->skippedDayNoRecentData} websites: no new visit since the last script execution"); - $this->logger->info("- Skipped {$this->skippedDayArchivesWebsites} websites: existing daily reports are less than {$this->todayArchiveTimeToLive} seconds old"); - $this->logger->info("- Skipped {$this->skippedPeriodsArchivesWebsite} websites: existing week/month/year periods reports are less than {$this->processPeriodsMaximumEverySeconds} seconds old"); + $this->logger->info("- {$this->skippedDayNoRecentData} skipped because no new visit since the last script execution"); + $this->logger->info("- {$this->skippedDayArchivesWebsites} skipped because existing daily reports are less than {$this->todayArchiveTimeToLive} seconds old"); + $this->logger->info("- {$this->skippedPeriodsArchivesWebsite} skipped because existing week/month/year periods reports are less than {$this->processPeriodsMaximumEverySeconds} seconds old"); if($this->skippedPeriodsNoDataInPeriod) { - $this->logger->info("- Skipped {$this->skippedPeriodsNoDataInPeriod} websites week/month/year archiving: no visit in recent days"); + $this->logger->info("- {$this->skippedPeriodsNoDataInPeriod} skipped periods archiving because no visit in recent days"); } if($this->skippedDayOnApiError) { - $this->logger->info("- Skipped {$this->skippedDayOnApiError} websites: got an error while querying reporting API"); + $this->logger->info("- {$this->skippedDayOnApiError} skipped because got an error while querying reporting API"); } $this->logger->info("Total API requests: {$this->requests}"); diff --git a/tests/PHPUnit/Integration/CronArchiveTest.php b/tests/PHPUnit/Integration/CronArchiveTest.php index b00263be9af453765e5879c2fb2829e242138e0b..f0e4b7c19c55a7278d966bebe275e193d9f1d438 100644 --- a/tests/PHPUnit/Integration/CronArchiveTest.php +++ b/tests/PHPUnit/Integration/CronArchiveTest.php @@ -129,9 +129,9 @@ Total visits for today across archived websites: 1 Archived today's reports for 1 websites Archived week/month/year for 1 websites Skipped 0 websites -- Skipped 0 websites: no new visit since the last script execution -- Skipped 0 websites: existing daily reports are less than 150 seconds old -- Skipped 0 websites: existing week/month/year periods reports are less than 3600 seconds old +- 0 skipped because no new visit since the last script execution +- 0 skipped because existing daily reports are less than 150 seconds old +- 0 skipped because existing week/month/year periods reports are less than 3600 seconds old Total API requests: %s done: 1/1 100%, 1 vtoday, 1 wtoday, 1 wperiods, %s req, %s ms, no error Time elapsed: %s