Ema has submitted this change and it was merged.
Change subject: dstat_varnishstat: define 'counters' as class variable
......................................................................
dstat_varnishstat: define 'counters' as class variable
Instead of defining 'counters' global, define it as class variable.
Change-Id: I77c19aff7d8c3301407ea893ab3e0a2b8bff164d
---
M modules/varnish/files/dstat_varnishstat.py
1 file changed, 17 insertions(+), 18 deletions(-)
Approvals:
Ema: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/varnish/files/dstat_varnishstat.py
b/modules/varnish/files/dstat_varnishstat.py
index e4fd716..ecc053b 100644
--- a/modules/varnish/files/dstat_varnishstat.py
+++ b/modules/varnish/files/dstat_varnishstat.py
@@ -21,29 +21,28 @@
import os
-counters = (
- ("fe-n_object", "f_nobj"),
- ("fe-n_lru_nuked", "f_nlru"),
- ("fe-backend_fail", "f_bfail"),
- ("be-n_object", "b_nobj"),
- ("be-n_lru_nuked", "b_nlru"),
- ("be-backend_fail", "b_bfail"),
- ("fe-threads", "f_thr"),
- ("fe-threads_created", "f_thc"),
- ("be-threads", "b_thr"),
- ("be-threads_created", "b_thc"),
- ("fe-exp-lag", "f_exlag"),
- ("be-exp-lag", "b_exlag"),
-)
-
class dstat_plugin(dstat): # noqa F821 undefined name 'dstat'
+ COUNTERS = (
+ ("fe-n_object", "f_nobj"),
+ ("fe-n_lru_nuked", "f_nlru"),
+ ("fe-backend_fail", "f_bfail"),
+ ("be-n_object", "b_nobj"),
+ ("be-n_lru_nuked", "b_nlru"),
+ ("be-backend_fail", "b_bfail"),
+ ("fe-threads", "f_thr"),
+ ("fe-threads_created", "f_thc"),
+ ("be-threads", "b_thr"),
+ ("be-threads_created", "b_thc"),
+ ("fe-exp-lag", "f_exlag"),
+ ("be-exp-lag", "b_exlag"),
+ )
+
def __init__(self):
- global counters
self.name = "varnishstat"
- self.vars = [i[0] for i in counters]
- self.nick = [i[1] for i in counters]
+ self.vars = [i[0] for i in self.COUNTERS]
+ self.nick = [i[1] for i in self.COUNTERS]
self.type = "d"
def check(self):
--
To view, visit https://gerrit.wikimedia.org/r/315643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77c19aff7d8c3301407ea893ab3e0a2b8bff164d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ema <e...@wikimedia.org>
Gerrit-Reviewer: Ema <e...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
