Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <diosmosis@users.noreply.github.com>2020-10-09 09:00:30 +0300
committerGitHub <noreply@github.com>2020-10-09 09:00:30 +0300
commit123be362ce4f972b82c8af6b091fa9fc2d46c4c2 (patch)
tree7790cc97de95074c61dc223a41048c064c1dd1ce /core/ArchiveProcessor
parent32974a696e3bd834310a74f685f0e4196aba3435 (diff)
three archiving fixes (#16548)
* unset status if an archiving job fails so it will be picked up again * If pluginOnly=1 is used when archiving, make sure we dont assume an existing done archive is useable. * Ignore idinvalidation on failure so we dont continually pick it up. * easier way to achieve same result * parameter no longer used * update system tests * fix more tests * fix test * make sure ArchiveSelector::getArchiveIds behaves consistently with ArchiveSelector::getArchiveIdAndVisits
Diffstat (limited to 'core/ArchiveProcessor')
-rw-r--r--core/ArchiveProcessor/Loader.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/ArchiveProcessor/Loader.php b/core/ArchiveProcessor/Loader.php
index d7ea423246..829d903a46 100644
--- a/core/ArchiveProcessor/Loader.php
+++ b/core/ArchiveProcessor/Loader.php
@@ -113,6 +113,7 @@ class Loader
list($idArchives, $visits, $visitsConverted, $isAnyArchiveExists) = $this->loadExistingArchiveIdFromDb();
if (!empty($idArchives)
&& !$this->params->getArchiveOnlyReport()
+ && !Rules::isForceArchivingSinglePlugin()
) {
// we have a usable idarchive (it's not invalidated and it's new enough), and we are not archiving
// a single report