From 82f3f05ede51aa7a29168d271c39ff496ef595b1 Mon Sep 17 00:00:00 2001
From: Thomas Steur <thomas.steur@googlemail.com>
Date: Mon, 7 Jul 2014 05:39:15 +0200
Subject: [PATCH] i am getting closer... on Travis CI the ip is not anonymized
when localtracker is used but it does locally
---
core/CacheFile.php | 9 +++++++++
core/Tracker.php | 2 +-
core/Tracker/Cache.php | 13 +++++++++++++
tests/LocalTracker.php | 9 +++++++++
4 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/core/CacheFile.php b/core/CacheFile.php
index 7a1c824ff8..f63cdd6d78 100644
--- a/core/CacheFile.php
+++ b/core/CacheFile.php
@@ -79,6 +79,12 @@ class CacheFile
$this->opCacheInvalidate($cacheFilePath);
}
+ if ('general' === $id && Common::isPhpCliMode()) {
+
+ $message = 'The path is ' . $cacheFilePath;
+ \Piwik\Log::getInstance()->customLogToFileForDebuggingIfYouStillSeeThisHereRemoveIt($message, false);
+ }
+
$ok = @include($cacheFilePath);
if ($ok && $cache_complete == true) {
@@ -197,6 +203,9 @@ class CacheFile
*/
public function deleteAll()
{
+ $message = 'Delete All Tracker Cache';
+ \Piwik\Log::getInstance()->customLogToFileForDebuggingIfYouStillSeeThisHereRemoveIt($message);
+
$self = $this;
$beforeUnlink = function ($path) use ($self) {
$self->opCacheInvalidate($path);
diff --git a/core/Tracker.php b/core/Tracker.php
index 5c491cb95d..69c1a9b7e0 100644
--- a/core/Tracker.php
+++ b/core/Tracker.php
@@ -254,7 +254,7 @@ class Tracker
}
Piwik::postEvent('Tracker.end');
-
+
$this->end();
$this->flushOutputBuffer();
diff --git a/core/Tracker/Cache.php b/core/Tracker/Cache.php
index 9183b191b7..eea63d4e13 100644
--- a/core/Tracker/Cache.php
+++ b/core/Tracker/Cache.php
@@ -103,6 +103,9 @@ class Cache
*/
static public function clearCacheGeneral()
{
+ $message = 'Clear Cache General ';
+ \Piwik\Log::getInstance()->customLogToFileForDebuggingIfYouStillSeeThisHereRemoveIt($message);
+
self::getInstance()->delete('general');
}
@@ -118,9 +121,19 @@ class Cache
$cacheId = 'general';
if (($cacheContent = $cache->get($cacheId)) !== false) {
+
+ if (Common::isPhpCliMode()) {
+ $message = 'there is already a cache general';
+ \Piwik\Log::getInstance()->customLogToFileForDebuggingIfYouStillSeeThisHereRemoveIt($message, false);
+ }
return $cacheContent;
}
+ if (Common::isPhpCliMode()) {
+ $message = 'recreating the cache general';
+ \Piwik\Log::getInstance()->customLogToFileForDebuggingIfYouStillSeeThisHereRemoveIt($message, false);
+ }
+
Tracker::initCorePiwikInTrackerMode();
$cacheContent = array(
'isBrowserTriggerEnabled' => Rules::isBrowserTriggerEnabled(),
diff --git a/tests/LocalTracker.php b/tests/LocalTracker.php
index 366996b465..153035d70b 100755
--- a/tests/LocalTracker.php
+++ b/tests/LocalTracker.php
@@ -43,6 +43,11 @@ class Piwik_LocalTracker extends PiwikTracker
$requests = array($testEnvironmentArgs);
}
+
+ $cacheContent = Cache::getCacheGeneral();
+ $message = 'CacheContent pre local ' . var_export($cacheContent, 1);
+ \Piwik\Log::getInstance()->customLogToFileForDebuggingIfYouStillSeeThisHereRemoveIt($message, false);
+
// unset cached values
Cache::$trackerCache = null;
Tracker::setForceIp(null);
@@ -74,6 +79,10 @@ class Piwik_LocalTracker extends PiwikTracker
$oldCookie = $_COOKIE;
// parse_str(parse_url($this->requestCookie, PHP_URL_QUERY), $_COOKIE);
+ $cacheContent = Cache::getCacheGeneral();
+ $message = 'CacheContent before local ' . var_export($cacheContent, 1);
+ \Piwik\Log::getInstance()->customLogToFileForDebuggingIfYouStillSeeThisHereRemoveIt($message, false);
+
// do tracking and capture output
ob_start();
--
GitLab