jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/348013 )
Change subject: Log the subprocess log path; dial normal lock messages down to
debug
......................................................................
Log the subprocess log path; dial normal lock messages down to debug
Change-Id: Id5913b86329d0e976aa56eb5b2a38d4495180bba
---
M processcontrol/lock.py
M processcontrol/runner.py
2 files changed, 4 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Ejegg: Looks good to me, approved
diff --git a/processcontrol/lock.py b/processcontrol/lock.py
index 1ea9f98..a55c39a 100644
--- a/processcontrol/lock.py
+++ b/processcontrol/lock.py
@@ -44,7 +44,7 @@
os.unlink(filename)
with open(filename, "w") as f:
- config.log.info("Writing lockfile.")
+ config.log.debug("Writing lockfile.")
f.write(str(os.getpid()))
global lockfile
@@ -55,7 +55,7 @@
global lockfile
if lockfile:
if os.path.exists(lockfile):
- config.log.info("Clearing lockfile.")
+ config.log.debug("Clearing lockfile.")
os.unlink(lockfile)
else:
raise LockError("Already unlocked!")
diff --git a/processcontrol/runner.py b/processcontrol/runner.py
index 12f4030..c9e1cef 100644
--- a/processcontrol/runner.py
+++ b/processcontrol/runner.py
@@ -52,6 +52,7 @@
if return_code != 0:
self.fail_exitcode(return_code)
job_history.record_success()
+ config.log.info("Successfully completed
{slug}.".format(slug=self.job.slug))
except (JobFailure, lock.LockError) as ex:
config.log.error(str(ex))
self.mailer.fail_mail(str(ex), logfile=self.logfile)
@@ -73,6 +74,7 @@
self.process = subprocess.Popen(command, stdout=subprocess.PIPE,
stderr=subprocess.PIPE, env=self.job.environment)
streamer = output_streamer.OutputStreamer(self.process, self.job.slug,
command_string, self.start_time)
self.logfile = streamer.filename
+ config.log.info("Logging to {path}".format(path=self.logfile))
streamer.start()
# should be safe from deadlocks because our OutputStreamer
--
To view, visit https://gerrit.wikimedia.org/r/348013
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id5913b86329d0e976aa56eb5b2a38d4495180bba
Gerrit-PatchSet: 4
Gerrit-Project: wikimedia/fundraising/process-control
Gerrit-Branch: master
Gerrit-Owner: Awight <awi...@wikimedia.org>
Gerrit-Reviewer: Cdentinger <cdentin...@wikimedia.org>
Gerrit-Reviewer: Ejegg <eeggles...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
