Sanja pavlovic has uploaded a new change for review.
https://gerrit.wikimedia.org/r/64095
Change subject: Changed code to give summary message about conf errors.
......................................................................
Changed code to give summary message about conf errors.
Change-Id: Ieaca0223e9b6d635ee5ee1709add1f9dbc3253c0
---
M xmldumps-backup/worker.py
1 file changed, 10 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dumps
refs/changes/95/64095/1
diff --git a/xmldumps-backup/worker.py b/xmldumps-backup/worker.py
index 6cebd4b..4c43c04 100644
--- a/xmldumps-backup/worker.py
+++ b/xmldumps-backup/worker.py
@@ -4186,23 +4186,26 @@
config = WikiDump.Config(configFile)
else:
config = WikiDump.Config()
+
externals = [
'php', 'mysql', 'mysqldump', 'head', 'tail',
'checkforbz2footer', 'grep', 'gzip', 'bzip2',
- 'writeuptopageid', 'recompressxml', '7zip', 'cat',]
+ 'writeuptopageid', 'recompressxml', 'sevenzip', 'cat',]
- incr = 0
+ configerror = False
+ errormessage = ""
for external in externals:
try:
ext = getattr(config,external)
except AttributeError:
- print ("Unknown config param: '%s'" % external)
- incr += 1
+ errormessage += "Unknown config param: '%s'\n"
% external
+ configerror = True
else:
if (not exists(ext)):
- print ("%s command '%s' not found" %
(external, ext))
- incr += 1
- if (incr > 0):
+ errormessage += "%s command '%s' not
found\n" % (external, ext)
+ configerror = True
+ if (configerror):
+ sys.stderr.write(errormessage)
sys.stderr.write("Exiting.\n")
sys.exit(1)
--
To view, visit https://gerrit.wikimedia.org/r/64095
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ieaca0223e9b6d635ee5ee1709add1f9dbc3253c0
Gerrit-PatchSet: 1
Gerrit-Project: operations/dumps
Gerrit-Branch: ariel
Gerrit-Owner: Sanja pavlovic <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
