From 075d74601919e146cd28636d313554f3c6142b5e Mon Sep 17 00:00:00 2001
From: diosmosis <benaka@piwik.pro>
Date: Sat, 31 Jan 2015 00:17:10 -0800
Subject: [PATCH] Add undocumented (ie, unsupported) config option (DI config
only) to disable forcing range archiving on browser request.
---
core/ArchiveProcessor/Rules.php | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/core/ArchiveProcessor/Rules.php b/core/ArchiveProcessor/Rules.php
index 1334ad1f9a..7b8bffb520 100644
--- a/core/ArchiveProcessor/Rules.php
+++ b/core/ArchiveProcessor/Rules.php
@@ -10,6 +10,7 @@ namespace Piwik\ArchiveProcessor;
use Exception;
use Piwik\Config;
+use Piwik\Container\StaticContainer;
use Piwik\DataAccess\ArchiveWriter;
use Piwik\Date;
use Piwik\Log;
@@ -229,13 +230,19 @@ class Rules
public static function isArchivingDisabledFor(array $idSites, Segment $segment, $periodLabel)
{
if ($periodLabel == 'range') {
- return false;
+ if (StaticContainer::get('archiving.range.force_on_browser_request') !== false) {
+ return false;
+ } else {
+ Log::verbose("Not forcing archiving for range period.");
+ }
}
+
$processOneReportOnly = !self::shouldProcessReportsAllPlugins($idSites, $segment, $periodLabel);
$isArchivingDisabled = !self::isRequestAuthorizedToArchive() || self::$archivingDisabledByTests;
- if ($processOneReportOnly) {
-
+ if ($processOneReportOnly
+ && $periodLabel != 'range'
+ ) {
// When there is a segment, we disable archiving when browser_archiving_disabled_enforce applies
if (!$segment->isEmpty()
&& $isArchivingDisabled
--
GitLab