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

[enh] Display log message to help to get log

Browse source
This commit is contained in:
ljf 2018-06-04 20:35:45 +02:00
parent 793b4d2f88
commit ab816f292e
2 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
locales/en.json
View file

@ -207,6 +207,11 @@
"iptables_unavailable": "You cannot play with iptables here. You are either in a container or your kernel does not support it",
"log_corrupted_md_file": "The yaml metadata file associated with logs is corrupted : '{md_file}'",
"log_category_404": "The log category '{category}' does not exist",
"log_link_to_log": "Complete log of this operation: '<a href=\"#/tools/logs/{name}\">{desc}</a>'",
"log_help_to_get_log": "To view complete log of the operation '{desc}', run: 'yunohost log display {name}'",
"log_link_to_failed_log": "The operation '{desc}' has failed ! To get help please <a href=\"#/tools/logs/{name}\">give the complete log</a>",
"log_help_to_get_failed_log": "The operation '{desc}' has failed ! To get help please give the complete log of the operation, you can get it by running: 'yunohost log display {name}'",
"log_category_404": "The log category '{category}' does not exist",
"log_does_exists": "There is not operation log with the name '{log}', use 'yunohost log list to see all available operation logs'",
"log_operation_unit_unclosed_properly": "Operation unit has not been closed properly",
"log_app_addaccess": "Add access to '{}'",

30
src/yunohost/log.py
View file

@ -38,6 +38,7 @@ from moulinette.core import MoulinetteError
from moulinette.utils.log import getActionLogger
CATEGORIES_PATH = '/var/log/yunohost/categories/'
OPERATIONS_PATH = '/var/log/yunohost/categories/operation/'
CATEGORIES = ['operation', 'history', 'package', 'system', 'access', 'service', \
'app']
METADATA_FILE_EXT = '.yml'
@ -219,10 +220,10 @@ def is_unit_operation(entities='app,domain,service,user', exclude='auth,password
entity = entity[0]
if entity in kwargs and kwargs[entity] is not None:
if isinstance(kwargs[entity], basestring):
related_to.append({entity_type: kwargs[entity]})
related_to.append((entity_type, kwargs[entity]))
else:
for x in kwargs[entity]:
related_to.append({entity_type: kwargs[x]})
related_to.append((entity_type, kwargs[x]))
context = kwargs.copy()
@ -314,7 +315,7 @@ class UnitOperation(object):
name = [self.started_at.strftime("%Y%m%d-%H%M%S")]
name += [self.operation]
if self.related_to:
name += self.related_to[0].values()
name += [self.related_to[0][1]]
return '-'.join(name)
@property
@ -361,6 +362,20 @@ class UnitOperation(object):
self._success = error is None
if self.logger is not None:
self.logger.removeHandler(self.file_handler)
is_api = msettings.get('interface') == 'api'
desc = _get_description_from_name(self.name)
if error is None:
if is_api:
logger.info(m18n.n('log_link_to_log', name=self.name, desc=desc))
else:
logger.info(m18n.n('log_help_to_get_log', name=self.name, desc=desc))
else:
if is_api:
logger.warning(m18n.n('log_link_to_failed_log', name=self.name, desc=desc))
else:
logger.warning(m18n.n('log_help_to_get_failed_log', name=self.name, desc=desc))
self.flush()
def __del__(self):
@ -371,3 +386,12 @@ class UnitOperation(object):
"""
self.error(m18n.n('log_operation_unit_unclosed_properly'))
def _get_description_from_name(name):
parts = name.split("-")
try:
datetime.strptime(" ".join(parts[:2]), "%Y%m%d %H%M%S")
except ValueError:
return m18n.n("log_" + parts[0], *parts[1:])
else:
return m18n.n("log_" + parts[2], *parts[3:])