From d310540a6f52727bf2475d0a9bc59d13628875e8 Mon Sep 17 00:00:00 2001 From: ljf Date: Tue, 10 Apr 2018 15:42:48 +0200 Subject: [PATCH] [enh] Set the date before operation name --- src/yunohost/log.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/yunohost/log.py b/src/yunohost/log.py index 7c1f3b2a8..6fa7ae489 100644 --- a/src/yunohost/log.py +++ b/src/yunohost/log.py @@ -62,11 +62,11 @@ def log_list(limit=None): operation = operation[:-len(OPERATION_FILE_EXT)] operation = operation.split("_") - operation_datetime = datetime.strptime(" ".join(operation[-2:]), "%Y-%m-%d %H-%M-%S") + operation_datetime = datetime.strptime(" ".join(operation[:2]), "%Y-%m-%d %H-%M-%S") result["categories"][-1]["logs"].append({ "started_at": operation_datetime, - "name": " ".join(operation[:-2]), + "name": " ".join(operation[-2:]), "file_name": file_name, "path": os.path.join(OPERATIONS_PATH, category, file_name), }) @@ -105,7 +105,7 @@ def log_display(file_name_list): operation = operation[:-len(OPERATION_FILE_EXT)] operation = operation.split("_") - operation_datetime = datetime.strptime(" ".join(operation[-2:]), "%Y-%m-%d %H-%M-%S") + operation_datetime = datetime.strptime(" ".join(operation[:2]), "%Y-%m-%d %H-%M-%S") infos, logs = content.split("\n---\n", 1) infos = yaml.safe_load(infos) @@ -113,14 +113,13 @@ def log_display(file_name_list): result['logs'].append({ "started_at": operation_datetime, - "name": " ".join(operation[:-2]), + "name": " ".join(operation[-2:]), "file_name": file_name, "path": os.path.join(OPERATIONS_PATH, category, file_name), "metadata": infos, "logs": logs, }) - logger.debug("====> %s", len(file_name_list), exc_info=1) if len(file_name_list) > 0 and len(result['logs']) < len(file_name_list): logger.error(m18n.n('log_does_exists', log="', '".join(file_name_list))) @@ -165,7 +164,7 @@ class Journal(object): if not os.path.exists(self.path): os.makedirs(self.path) - file_name = "%s_%s" % (self.name if isinstance(self.name, basestring) else "_".join(self.name), self.started_at.strftime("%F_%X").replace(":", "-")) + file_name = "%s_%s" % (self.started_at.strftime("%F_%X").replace(":", "-"), self.name if isinstance(self.name, basestring) else "_".join(self.name)) file_name += OPERATION_FILE_EXT serialized_additional_information = yaml.safe_dump(self.additional_information, default_flow_style=False)