Fixes #4382, purge outdated archives after current archive is finalized.

matomo-org · Dec 20, 2013 · 6980299 · 6980299
1 parent 178bc36
commit 6980299
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/core/ArchiveProcessor/Loader.php b/core/ArchiveProcessor/Loader.php
@@ -120,7 +120,12 @@ protected function prepareAllPluginsArchive($visits, $visitsConverted)
             $pluginsArchiver->callAggregateAllPlugins($visits, $visitsConverted);
         }
         $idArchive = $pluginsArchiver->finalizeArchive();
-        return array( $idArchive, $visits);
+
+        if (!$this->params->isSingleSiteDayArchive() && $visits) {
+            ArchiveSelector::purgeOutdatedArchives($this->params->getPeriod()->getDateStart());
+        }
+
+        return array($idArchive, $visits);
     }
 
     protected function doesRequestedPluginIncludeVisitsSummary()

diff --git a/core/ArchiveProcessor/PluginsArchiver.php b/core/ArchiveProcessor/PluginsArchiver.php
@@ -98,10 +98,6 @@ public function callAggregateAllPlugins($visits, $visitsConverted)
                 }
             }
         }
-
-        if (!$this->isSingleSiteDayArchive && $visits) {
-            ArchiveSelector::purgeOutdatedArchives($this->params->getPeriod()->getDateStart());
-        }
     }
 
     public function finalizeArchive()

diff --git a/tests/PHPUnit/UITest.php b/tests/PHPUnit/UITest.php
@@ -52,7 +52,6 @@ public static function setUpBeforeClass()
         AssetManager::getInstance()->removeMergedAssets();
 
         // launch archiving so tests don't run out of time
-        Rules::$purgeDisabledByTests = true;
         $date = Date::factory(static::$fixture->dateTime)->toString();
         API::getInstance()->get(static::$fixture->idSite, 'year', $date);
 
@@ -184,8 +183,6 @@ protected function compareScreenshot($name, $urlQuery)
         list($processedPath, $expectedPath) = self::getProcessedAndExpectedScreenshotPaths($name);
 
         $this->compareScreenshotAgainstExpected($name, $urlQuery, $processedPath, $expectedPath);
-
-
     }
 
     private function saveImageDiff($expectedPath, $processedPath, $diffPath)