YunoHost/moulinette
1
0
Fork 0
mirror of https://github.com/YunoHost/moulinette.git synced 2024-09-03 20:06:31 +02:00
Code Issues Projects Releases Packages Wiki Activity

[enh] Rename some logs into operations

Browse source
This commit is contained in:
ljf 2018-04-11 09:31:40 +02:00
parent fb27b4d5f2
commit c1bd302973
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/yunohost/log.py
View file

@ -54,7 +54,7 @@ def log_list(limit=None):
return result return result
for category in sorted(os.listdir(OPERATIONS_PATH)): for category in sorted(os.listdir(OPERATIONS_PATH)):
result["categories"].append({"name": category, "logs": []}) result["categories"].append({"name": category, "operations": []})
for operation in filter(lambda x: x.endswith(OPERATION_FILE_EXT), os.listdir(os.path.join(OPERATIONS_PATH, category))): for operation in filter(lambda x: x.endswith(OPERATION_FILE_EXT), os.listdir(os.path.join(OPERATIONS_PATH, category))):
file_name = operation file_name = operation
@ -64,17 +64,17 @@ def log_list(limit=None):
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({ result["categories"][-1]["operations"].append({
"started_at": operation_datetime, "started_at": operation_datetime,
"name": " ".join(operation[-2:]), "name": " ".join(operation[-2:]),
"file_name": file_name, "file_name": file_name,
"path": os.path.join(OPERATIONS_PATH, category, file_name), "path": os.path.join(OPERATIONS_PATH, category, file_name),
}) })
result["categories"][-1]["logs"] = list(reversed(sorted(result["categories"][-1]["logs"], key=lambda x: x["started_at"]))) result["categories"][-1]["operations"] = list(reversed(sorted(result["categories"][-1]["operations"], key=lambda x: x["started_at"])))
if limit is not None: if limit is not None:
result["categories"][-1]["logs"] = result["categories"][-1]["logs"][:limit] result["categories"][-1]["operations"] = result["categories"][-1]["operations"][:limit]
return result return result
@ -91,7 +91,7 @@ def log_display(file_name_list):
raise MoulinetteError(errno.EINVAL, raise MoulinetteError(errno.EINVAL,
m18n.n('log_does_exists', log=" ".join(file_name_list))) m18n.n('log_does_exists', log=" ".join(file_name_list)))
result = {"logs": []} result = {"operations": []}
for category in os.listdir(OPERATIONS_PATH): for category in os.listdir(OPERATIONS_PATH):
for operation in filter(lambda x: x.endswith(OPERATION_FILE_EXT), os.listdir(os.path.join(OPERATIONS_PATH, category))): for operation in filter(lambda x: x.endswith(OPERATION_FILE_EXT), os.listdir(os.path.join(OPERATIONS_PATH, category))):
@ -111,7 +111,7 @@ def log_display(file_name_list):
infos = yaml.safe_load(infos) infos = yaml.safe_load(infos)
logs = [{"datetime": x.split(": ", 1)[0].replace("_", " "), "line": x.split(": ", 1)[1]} for x in logs.split("\n") if x] logs = [{"datetime": x.split(": ", 1)[0].replace("_", " "), "line": x.split(": ", 1)[1]} for x in logs.split("\n") if x]
result['logs'].append({ result['operations'].append({
"started_at": operation_datetime, "started_at": operation_datetime,
"name": " ".join(operation[-2:]), "name": " ".join(operation[-2:]),
"file_name": file_name, "file_name": file_name,
@ -120,11 +120,11 @@ def log_display(file_name_list):
"logs": logs, "logs": logs,
}) })
if len(file_name_list) > 0 and len(result['logs']) < len(file_name_list): if len(file_name_list) > 0 and len(result['operations']) < len(file_name_list):
logger.error(m18n.n('log_does_exists', log="', '".join(file_name_list))) logger.error(m18n.n('log_does_exists', log="', '".join(file_name_list)))
if len(result['logs']) > 0: if len(result['operations']) > 0:
result['logs'] = sorted(result['logs'], key=lambda operation: operation['started_at']) result['operations'] = sorted(result['operations'], key=lambda operation: operation['started_at'])
return result return result
class Journal(object): class Journal(object):