ArielGlenn has submitted this change and it was merged.
Change subject: Per bug #48012. Compressed possible errors into for loop;
program exits if there is one or more errors and writes all of them.
......................................................................
Per bug #48012. Compressed possible errors into for loop; program exits if
there is one or more errors and writes all of them.
Change-Id: Ied6711771d4db7aae6858f1fccf0020e8297b4c7
---
M xmldumps-backup/worker.py
1 file changed, 25 insertions(+), 0 deletions(-)
Approvals:
ArielGlenn: Looks good to me, approved
jenkins-bot: Verified
diff --git a/xmldumps-backup/worker.py b/xmldumps-backup/worker.py
index a85cfee..d21c3f6 100644
--- a/xmldumps-backup/worker.py
+++ b/xmldumps-backup/worker.py
@@ -4226,6 +4226,31 @@
config = WikiDump.Config(configFile)
else:
config = WikiDump.Config()
+ externals = [
+ 'php', 'mysql', 'mysqldump', 'head', 'tail',
+ 'checkforbz2footer', 'grep', 'gzip', 'bzip2',
+ 'writeuptopageid', 'recompressxml', 'sevenzip', 'cat',]
+
+ failed = False
+ unknowns = []
+ notfound = []
+ for external in externals:
+ try:
+ ext = getattr(config, external)
+ except AttributeError:
+ unknowns.append(external)
+ failed = True
+ else:
+ if (not exists(ext)):
+ notfound.append(ext)
+ failed = True
+ if failed:
+ if unknowns:
+ sys.stderr.write("Unknown config param(s):
%s\n" % ", ".join(unknowns))
+ if notfound:
+ sys.stderr.write("Command(s) not found: %s\n"
% ", ".join(notfound))
+ sys.stderr.write("Exiting.\n")
+ sys.exit(1)
if dryrun or chunkToDo or (jobRequested and not restart and
not doLocking):
locksEnabled = False
--
To view, visit https://gerrit.wikimedia.org/r/63782
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ied6711771d4db7aae6858f1fccf0020e8297b4c7
Gerrit-PatchSet: 3
Gerrit-Project: operations/dumps
Gerrit-Branch: ariel
Gerrit-Owner: Sanja pavlovic <[email protected]>
Gerrit-Reviewer: ArielGlenn <[email protected]>
Gerrit-Reviewer: Hydriz <[email protected]>
Gerrit-Reviewer: Qgil <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
