From 47cd0bb26dab99fb9917a7cf64c5c9fbed358ece Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Wed, 2 Apr 2014 17:18:14 +1300
Subject: [PATCH] Refs #4903 Fix regression + tweaks to debug message (thanks
phpstorm for telling me the variable was unused)
---
core/CronArchive.php | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/core/CronArchive.php b/core/CronArchive.php
index a9adbeaa73..0f3e877de5 100644
--- a/core/CronArchive.php
+++ b/core/CronArchive.php
@@ -358,7 +358,7 @@ class CronArchive
}
if ($skipDayArchive) {
- $this->log("Skipped website id $idsite, already processed today's report in recent run, "
+ $this->log("Skipped website id $idsite, already done "
. \Piwik\MetricsFormatter::getPrettyTimeFromSeconds($elapsedSinceLastArchiving, true, $isHtml = false)
. " ago, " . $timerWebsite->__toString());
$this->skippedDayArchivesWebsites++;
@@ -389,13 +389,12 @@ class CronArchive
$timer = new Timer;
- $dateLast = $this->getApiDateLastParameter($idsite, "day");
+ $dateLast = $this->getApiDateLastParameter($idsite, "day", $processDaysSince);
$url = $this->getVisitsRequestUrl($idsite, "day", $dateLast);
$content = $this->request($url);
$response = @unserialize($content);
$visitsToday = $this->getVisitsLastPeriodFromApiResponse($response);
$visitsLastDays = $this->getVisitsFromApiResponse($response);
- $this->logArchivedWebsite($idsite, "day", $dateLast, $visitsLastDays, $visitsToday, $timer);
if (empty($content)
|| !is_array($response)
@@ -434,9 +433,10 @@ class CronArchive
$this->visitsToday += $visitsToday;
$this->websitesWithVisitsSinceLastRun++;
$this->archiveVisitsAndSegments($idsite, "day", $lastTimestampWebsiteProcessedDay);
+ $this->logArchivedWebsite($idsite, "day", $dateLast, $visitsLastDays, $visitsToday, $timer);
if (!$shouldArchivePeriods) {
- $this->log("Skipped website id $idsite, already processed period reports in recent run, "
+ $this->log("Skipped website id $idsite periods processing, already done "
. \Piwik\MetricsFormatter::getPrettyTimeFromSeconds($elapsedSinceLastArchiving, true, $isHtml = false)
. " ago, " . $timerWebsite->__toString());
$this->skippedDayArchivesWebsites++;
@@ -1181,9 +1181,10 @@ class CronArchive
*/
private function logArchivedWebsite($idsite, $period, $dateLast, $visitsInLastPeriods, $visitsToday, Timer $timer)
{
+ $thisPeriod = $period == "day" ? "today" : "this " . $period;
$this->log("Archived website id = $idsite, period = $period, "
. (int)$visitsInLastPeriods . " visits in last " . $dateLast . " " . $period . "s, "
- . (int)$visitsToday . " visits this " . $period . ", "
+ . (int)$visitsToday . " visits " . $thisPeriod . ", "
. $timer->__toString());
}
}
--
GitLab