diff options
| author | Byron Jones <bjones@mozilla.com> | 2014-03-06 19:15:19 +0100 |
|---|---|---|
| committer | Byron Jones <bjones@mozilla.com> | 2014-03-06 19:15:19 +0100 |
| commit | a36d1bc13c25446a7639e3710d51f1e6b2e6dd21 (patch) | |
| tree | ccdeebcbc7bef1a9211f6d2a0124771b8d919d65 /Bugzilla.pm | |
| parent | 8bd1b7e6603b41f4c8227c309596eb674df8babd (diff) | |
| download | bugzilla-a36d1bc13c25446a7639e3710d51f1e6b2e6dd21.tar.gz bugzilla-a36d1bc13c25446a7639e3710d51f1e6b2e6dd21.tar.xz | |
Bug 980388: metrics.pl is being called even when metrics_enabled is false
Diffstat (limited to 'Bugzilla.pm')
| -rw-r--r-- | Bugzilla.pm | 8 |
1 files changed, 7 insertions, 1 deletions
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}; |