Elukey has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/364743 )
Change subject: eventlogging_cleaner.py: configure configparser
......................................................................
eventlogging_cleaner.py: configure configparser
ConfigParser needs to allow duplicate/empty values while reading
a my.cnf config to avoid unnecessary runtime exceptions.
Change-Id: I13904b55c3ba1dae9473af4f22a6dba30c1822fe
---
M modules/role/files/mariadb/eventlogging_cleaner.py
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Elukey: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/files/mariadb/eventlogging_cleaner.py
b/modules/role/files/mariadb/eventlogging_cleaner.py
index 76e3f44..4baf78b 100644
--- a/modules/role/files/mariadb/eventlogging_cleaner.py
+++ b/modules/role/files/mariadb/eventlogging_cleaner.py
@@ -490,7 +490,11 @@
whitelist = {}
# Parse the db my.cnf config file
- config = configparser.ConfigParser()
+ # my.cn may contain duplicate entries within the same section
+ # (like multiple plugin-load) and also empty statements (not followed
by
+ # by any '=') so configparser needs to be relaxed a bit to avoid
+ # unnecessary runtime exceptions.
+ config = configparser.ConfigParser(strict=False, allow_no_value=True)
config.read(args.my_cnf)
# Priority to the local unix socket, default to username/password
--
To view, visit https://gerrit.wikimedia.org/r/364743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I13904b55c3ba1dae9473af4f22a6dba30c1822fe
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Elukey <ltosc...@wikimedia.org>
Gerrit-Reviewer: Mforns <mfo...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
