From 97941db8c8ea36dd36551360ea8ee4d127d595d6 Mon Sep 17 00:00:00 2001
From: Matthieu Aubry <mattab@users.noreply.github.com>
Date: Thu, 7 Sep 2017 13:40:46 +1200
Subject: [PATCH] Restore the speed of Visitor Log (#12009)
* render template only if needed
* reuse same Twig instance
* cache CacheBuster to prevent recalculation when needed multiple times
---
core/AssetManager/UIAssetCacheBuster.php | 32 +++++++++++++------
core/View.php | 9 ++++--
plugins/CustomVariables/VisitorDetails.php | 4 +++
.../templates/_visitorDetails.twig | 6 ++--
4 files changed, 35 insertions(+), 16 deletions(-)
diff --git a/core/AssetManager/UIAssetCacheBuster.php b/core/AssetManager/UIAssetCacheBuster.php
index fcbd0720a9..15b55943b9 100644
--- a/core/AssetManager/UIAssetCacheBuster.php
+++ b/core/AssetManager/UIAssetCacheBuster.php
@@ -27,20 +27,32 @@ class UIAssetCacheBuster extends Singleton
*/
public function piwikVersionBasedCacheBuster($pluginNames = false)
{
- $masterFile = PIWIK_INCLUDE_PATH . '/.git/refs/heads/master';
- $currentGitHash = file_exists($masterFile) ? @file_get_contents($masterFile) : null;
+ static $cachedCacheBuster = null;
- $pluginNames = !$pluginNames ? Manager::getInstance()->getLoadedPluginsName() : $pluginNames;
- sort($pluginNames);
+ if (empty($cachedCacheBuster) || $pluginNames !== false) {
- $pluginsInfo = '';
- foreach ($pluginNames as $pluginName) {
- $plugin = Manager::getInstance()->getLoadedPlugin($pluginName);
- $pluginsInfo .= $plugin->getPluginName() . $plugin->getVersion() . ',';
+ $masterFile = PIWIK_INCLUDE_PATH . '/.git/refs/heads/master';
+ $currentGitHash = file_exists($masterFile) ? @file_get_contents($masterFile) : null;
+
+ $plugins = !$pluginNames ? Manager::getInstance()->getLoadedPluginsName() : $pluginNames;
+ sort($plugins);
+
+ $pluginsInfo = '';
+ foreach ($plugins as $pluginName) {
+ $plugin = Manager::getInstance()->getLoadedPlugin($pluginName);
+ $pluginsInfo .= $plugin->getPluginName() . $plugin->getVersion() . ',';
+ }
+
+ $cacheBuster = md5($pluginsInfo . PHP_VERSION . Version::VERSION . trim($currentGitHash));
+
+ if ($pluginNames !== false) {
+ return $cacheBuster;
+ }
+
+ $cachedCacheBuster = $cacheBuster;
}
- $cacheBuster = md5($pluginsInfo . PHP_VERSION . Version::VERSION . trim($currentGitHash));
- return $cacheBuster;
+ return $cachedCacheBuster;
}
/**
diff --git a/core/View.php b/core/View.php
index e74eae6201..3c90b5f9a7 100644
--- a/core/View.php
+++ b/core/View.php
@@ -212,10 +212,15 @@ class View implements ViewInterface
return isset($this->templateVars[$name]);
}
+ /** @var Twig */
+ static $twigCached = null;
+
private function initializeTwig()
{
- $piwikTwig = new Twig();
- $this->twig = $piwikTwig->getTwigEnvironment();
+ if (empty(static::$twigCached)) {
+ static::$twigCached = new Twig();
+ }
+ $this->twig = static::$twigCached->getTwigEnvironment();
}
/**
diff --git a/plugins/CustomVariables/VisitorDetails.php b/plugins/CustomVariables/VisitorDetails.php
index e90af8e3c1..6be82c6e43 100644
--- a/plugins/CustomVariables/VisitorDetails.php
+++ b/plugins/CustomVariables/VisitorDetails.php
@@ -68,6 +68,10 @@ class VisitorDetails extends VisitorDetailsAbstract
public function renderVisitorDetails($visitInfo)
{
+ if (empty($visitInfo['customVariables'])) {
+ return [];
+ }
+
$view = new View('@CustomVariables/_visitorDetails');
$view->visitInfo = $visitInfo;
return [[ 50, $view->render() ]];
diff --git a/plugins/CustomVariables/templates/_visitorDetails.twig b/plugins/CustomVariables/templates/_visitorDetails.twig
index df26da450d..010f9f7d22 100644
--- a/plugins/CustomVariables/templates/_visitorDetails.twig
+++ b/plugins/CustomVariables/templates/_visitorDetails.twig
@@ -1,5 +1,4 @@
-{% if visitInfo.getColumn('customVariables') %}
- <div class="visitorCustomVariables">
+<div class="visitorCustomVariables">
{% for id,customVariable in visitInfo.getColumn('customVariables') %}
{% set name='customVariableName' ~ id %}
{% set value='customVariableValue' ~ id %}
@@ -9,5 +8,4 @@
</abbr>
{% if customVariable[value]|length > 0 %}: {{ customVariable[value]|truncate(50) }}{% endif %}
{% endfor %}
- </div>
-{% endif %}
\ No newline at end of file
+</div>
\ No newline at end of file
--
GitLab