Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346640 )
Change subject: [WIP] Fix double-failmail after timeout.
......................................................................
[WIP] Fix double-failmail after timeout.
Change-Id: Ie0cd58e9a890ecf9100f022cffec0743b9327504
---
M processcontrol/runner.py
1 file changed, 5 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/40/346640/1
diff --git a/processcontrol/runner.py b/processcontrol/runner.py
index 82fa6fc..c2cbd13 100644
--- a/processcontrol/runner.py
+++ b/processcontrol/runner.py
@@ -17,6 +17,7 @@
self.job = job
self.mailer = mailer.Mailer(self.job, self)
self.logfile = None
+ self.killer_was_me = False
def run(self):
# Check that we are the service user.
@@ -78,6 +79,9 @@
self.process = None
def fail_exitcode(self, return_code):
+ if self.killer_was_me and return_code == -9:
+ # We already mailed and stuff.
+ return
message = "{name} failed with code {code}".format(name=self.job.name,
code=return_code)
config.log.error(message)
# TODO: Prevent future jobs according to config.
@@ -93,12 +97,12 @@
raise JobFailure(message)
def fail_timeout(self):
+ self.timed_out = True
self.process.kill()
message = "{name} timed out after {timeout}
minutes".format(name=self.job.name, timeout=self.job.timeout)
config.log.error(message)
self.mailer.fail_mail(message)
# FIXME: Job will return SIGKILL now, fail_exitcode should ignore that
signal now?
- raise JobFailure(message)
def status(self):
"""Check for any running instances of this job, in this process or
another.
--
To view, visit https://gerrit.wikimedia.org/r/346640
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie0cd58e9a890ecf9100f022cffec0743b9327504
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
