Rush has submitted this change and it was merged.
Change subject: maintain-views: allow table specification for custom view
......................................................................
maintain-views: allow table specification for custom view
Bugs: T150679
Change-Id: I75b8ec171ba45b607eb457444168435cf42e46e3
---
M modules/role/files/labsdb/maintain-views.py
1 file changed, 5 insertions(+), 2 deletions(-)
Approvals:
Rush: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/files/labsdb/maintain-views.py
b/modules/role/files/labsdb/maintain-views.py
index 71149a4..ab9b82f 100644
--- a/modules/role/files/labsdb/maintain-views.py
+++ b/modules/role/files/labsdb/maintain-views.py
@@ -356,8 +356,11 @@
if args.table:
fullviews = [t for t in config["fullviews"] if t == args.table]
- # TODO: stop ignoring customviews on table specification
+
customviews = {}
+ for view, meta in config['customviews'].items():
+ if meta['source'] == args.table:
+ customviews[view] = config['customviews'][view]
else:
fullviews = config['fullviews']
customviews = config['customviews']
@@ -379,7 +382,7 @@
# This is weirdly arranged and should be cleaned up
# to be more explicit at the config file layer
- if customviews:
+ if 'logging' in customviews.keys():
safelog = ("log_type IN ('" +
"', '".join(config["logging_whitelist"]) +
"')")
--
To view, visit https://gerrit.wikimedia.org/r/323848
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I75b8ec171ba45b607eb457444168435cf42e46e3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Rush <[email protected]>
Gerrit-Reviewer: Rush <[email protected]>
Gerrit-Reviewer: Volans <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
