Awight has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/346680 )
Change subject: make logfile path statically
......................................................................
make logfile path statically
This would be useful for reuse.
Change-Id: Ic096594a7d90cf64ed9dae35ac73cb8ef4c222c0
---
M processcontrol/output_streamer.py
1 file changed, 17 insertions(+), 17 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/process-control
refs/changes/80/346680/1
diff --git a/processcontrol/output_streamer.py
b/processcontrol/output_streamer.py
index ba77ede..4735580 100644
--- a/processcontrol/output_streamer.py
+++ b/processcontrol/output_streamer.py
@@ -7,6 +7,22 @@
from . import config
+def make_logfile_path(slug, start_time):
+ """
+ Makes the output file path and creates parent directory if needed
+ """
+ output_directory = config.GlobalConfiguration().get("output_directory")
+ assert os.access(output_directory, os.W_OK)
+
+ # per-job directory
+ job_log_directory = output_directory + "/" + slug
+ if not os.path.exists(job_log_directory):
+ os.makedirs(job_log_directory)
+
+ timestamp = start_time.strftime("%Y%m%d-%H%M%S")
+ return "{logdir}/{name}-{timestamp}.log".format(logdir=job_log_directory,
name=slug, timestamp=timestamp)
+
+
class OutputStreamer(object):
def __init__(self, process, slug, start_time):
@@ -14,8 +30,7 @@
self.err_stream = process.stderr
self.pid = process.pid
self.slug = slug
- self.start_time = start_time
- self.filename = self.make_logfile_path()
+ self.filename = make_logfile_path(slug, start_time)
self.logger = None
self.threads = {}
self.log_handlers = []
@@ -46,21 +61,6 @@
self.logger.error(line)
else:
self.logger.info(line)
-
- def make_logfile_path(self):
- """
- Makes the output file path and creates parent directory if needed
- """
- output_directory = config.GlobalConfiguration().get("output_directory")
- assert os.access(output_directory, os.W_OK)
-
- # per-job directory
- job_directory = output_directory + "/" + self.slug
- if not os.path.exists(job_directory):
- os.makedirs(job_directory)
-
- timestamp = self.start_time.strftime("%Y%m%d-%H%M%S")
- return "{logdir}/{name}-{timestamp}.log".format(logdir=job_directory,
name=self.slug, timestamp=timestamp)
def init_logger(self):
if self.logger is not None:
--
To view, visit https://gerrit.wikimedia.org/r/346680
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic096594a7d90cf64ed9dae35ac73cb8ef4c222c0
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
