From a36d1bc13c25446a7639e3710d51f1e6b2e6dd21 Mon Sep 17 00:00:00 2001
From: Byron Jones <bjones@mozilla.com>
Date: Fri, 7 Mar 2014 02:15:19 +0800
Subject: Bug 980388: metrics.pl is being called even when metrics_enabled is
 false

---
 Bugzilla.pm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'Bugzilla.pm')

diff --git a/Bugzilla.pm b/Bugzilla.pm
index 233cc4323..52a44e375 100644
--- a/Bugzilla.pm
+++ b/Bugzilla.pm
@@ -697,8 +697,14 @@ sub process_cache {
 
 sub metrics_enabled {
     if (defined $_[1]) {
+        if (!$_[1]
+            && $_[0]->request_cache->{metrics_enabled}
+            && $_[0]->request_cache->{metrics})
+        {
+            $_[0]->request_cache->{metrics}->cancel();
+            delete $_[0]->request_cache->{metrics};
+        }
         $_[0]->request_cache->{metrics_enabled} = $_[1];
-        delete $_[0]->request_cache->{metrics} unless $_[1];
     }
     else {
         return $_[0]->request_cache->{metrics_enabled};
-- 
cgit v1.2.3-24-g4f1b