Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/343965 )
Change subject: Fixes suggested by thcipriani
......................................................................
Fixes suggested by thcipriani
Change-Id: I03592650c63907ffa4e14a1a136372bff3038f79
---
M processcontrol/crontab.py
M processcontrol/job_wrapper.py
M processcontrol/lock.py
3 files changed, 18 insertions(+), 21 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/65/343965/1
diff --git a/processcontrol/crontab.py b/processcontrol/crontab.py
index 566b573..ba6b7bc 100644
--- a/processcontrol/crontab.py
+++ b/processcontrol/crontab.py
@@ -1,5 +1,5 @@
import glob
-import os.path
+import os
import job_wrapper
diff --git a/processcontrol/job_wrapper.py b/processcontrol/job_wrapper.py
index 4c3cae6..b50c0e2 100644
--- a/processcontrol/job_wrapper.py
+++ b/processcontrol/job_wrapper.py
@@ -86,16 +86,15 @@
return
destination = self.config["stdout_destination"]
- out = open(destination, "a")
+ with open(destination, "a") as out:
+ header = (
+ "===========\n"
+ "{name} ({pid}), started at {time}\n"
+ "-----------\n"
+ ).format(name=self.name, pid=self.process.pid,
time=self.start_time)
+ print(header, file=out)
- header = (
- "===========\n"
- "{name} ({pid}), started at {time}\n"
- "-----------\n"
- ).format(name=self.name, pid=self.process.pid, time=self.start_time)
- print(header, file=out)
-
- out.write(stdout_data.decode("utf-8"))
+ out.write(stdout_data.decode("utf-8"))
def validate_config(self):
assert "name" in self.config
diff --git a/processcontrol/lock.py b/processcontrol/lock.py
index 6c91863..6af0bb5 100644
--- a/processcontrol/lock.py
+++ b/processcontrol/lock.py
@@ -5,7 +5,6 @@
'''
from __future__ import print_function
import os
-import os.path
import sys
lockfile = None
@@ -17,13 +16,13 @@
if os.path.exists(filename):
print("Lockfile found!", file=sys.stderr)
- f = open(filename, "r")
- pid = None
- try:
- pid = int(f.read())
- except ValueError:
- pass
- f.close()
+ with open(filename, "r") as f:
+ pid = None
+ try:
+ pid = int(f.read())
+ except ValueError:
+ pass
+
if not pid:
print("Invalid lockfile contents.", file=sys.stderr)
else:
@@ -37,9 +36,8 @@
print("Removing old lockfile.", file=sys.stderr)
os.unlink(filename)
- f = open(filename, "w")
- f.write(str(os.getpid()))
- f.close()
+ with open(filename, "w") as f:
+ f.write(str(os.getpid()))
global lockfile
lockfile = filename
--
To view, visit https://gerrit.wikimedia.org/r/343965
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I03592650c63907ffa4e14a1a136372bff3038f79
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
