mirror of
https://github.com/YunoHost/yunohost.git
synced 2024-09-03 20:06:10 +02:00
[enh] Better help for log list action
This commit is contained in:
parent
89124d4a9f
commit
5676f05dfb
3 changed files with 9 additions and 3 deletions
|
@ -1614,8 +1614,8 @@ log:
|
||||||
action_help: List logs
|
action_help: List logs
|
||||||
api: GET /logs
|
api: GET /logs
|
||||||
arguments:
|
arguments:
|
||||||
categories:
|
category:
|
||||||
help: Log categories to display (default operations)
|
help: Log category to display (default operations), could be operation, history, package, system, access, service or app
|
||||||
nargs: "*"
|
nargs: "*"
|
||||||
-l:
|
-l:
|
||||||
full: --limit
|
full: --limit
|
||||||
|
|
|
@ -206,6 +206,7 @@
|
||||||
"ip6tables_unavailable": "You cannot play with ip6tables here. You are either in a container or your kernel does not support it",
|
"ip6tables_unavailable": "You cannot play with ip6tables here. You are either in a container or your kernel does not support it",
|
||||||
"iptables_unavailable": "You cannot play with iptables here. You are either in a container or your kernel does not support it",
|
"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_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_does_exists": "There is not operation log with the name '{log}', use 'yunohost log list to see all available operation logs'",
|
"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_operation_unit_unclosed_properly": "Operation unit has not been closed properly",
|
||||||
"log_app_removelist": "Remove an application list",
|
"log_app_removelist": "Remove an application list",
|
||||||
|
|
|
@ -46,7 +46,7 @@ RELATED_CATEGORIES = ['app', 'domain', 'service', 'user']
|
||||||
|
|
||||||
logger = getActionLogger('yunohost.log')
|
logger = getActionLogger('yunohost.log')
|
||||||
|
|
||||||
def log_list(categories=[], limit=None):
|
def log_list(category=[], limit=None):
|
||||||
"""
|
"""
|
||||||
List available logs
|
List available logs
|
||||||
|
|
||||||
|
@ -54,6 +54,9 @@ def log_list(categories=[], limit=None):
|
||||||
limit -- Maximum number of logs
|
limit -- Maximum number of logs
|
||||||
"""
|
"""
|
||||||
|
|
||||||
|
categories = category
|
||||||
|
|
||||||
|
# In cli we just display `operation` logs by default
|
||||||
if not categories:
|
if not categories:
|
||||||
is_api = msettings.get('interface') == 'api'
|
is_api = msettings.get('interface') == 'api'
|
||||||
categories = ["operation"] if not is_api else CATEGORIES
|
categories = ["operation"] if not is_api else CATEGORIES
|
||||||
|
@ -64,6 +67,8 @@ def log_list(categories=[], limit=None):
|
||||||
|
|
||||||
category_path = os.path.join(CATEGORIES_PATH, category)
|
category_path = os.path.join(CATEGORIES_PATH, category)
|
||||||
if not os.path.exists(category_path):
|
if not os.path.exists(category_path):
|
||||||
|
logger.warning(m18n.n('log_category_404', category=category))
|
||||||
|
|
||||||
continue
|
continue
|
||||||
|
|
||||||
logs = filter(lambda x: x.endswith(METADATA_FILE_EXT), os.listdir(category_path))
|
logs = filter(lambda x: x.endswith(METADATA_FILE_EXT), os.listdir(category_path))
|
||||||
|
|
Loading…
Add table
Reference in a new issue