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

Let the ability to choose the number of lines to display in service log

Browse source
This commit is contained in:
Kload 2013-12-07 10:11:29 +00:00
parent 8d901d74cf
commit 5e0e0024b2
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
action_map.yml
View file

@ -591,8 +591,13 @@ service:
log: log:
action_help: Log every log files of a service action_help: Log every log files of a service
arguments: arguments:
name: name:
help: Service name to log help: Service name to log
-n:
full: --number
help: Number of lines to display
pattern: '^[0-9]+$'
default: 50
############################# #############################

7
yunohost_service.py
View file

@ -143,12 +143,13 @@ def service_status(names=None):
return result return result
def service_log(name): def service_log(name, number=50):
""" """
Log every log files of a service Log every log files of a service
Keyword argument: Keyword argument:
name -- Services name to log name -- Services name to log
number -- Number of lines to display
""" """
services = _get_services() services = _get_services()
@ -165,9 +166,9 @@ def service_log(name):
for log_path in log_list: for log_path in log_list:
if os.path.isdir(log_path): if os.path.isdir(log_path):
for log in [ f for f in os.listdir(log_path) if os.path.isfile(os.path.join(log_path, f)) and f[-4:] == '.log' ]: for log in [ f for f in os.listdir(log_path) if os.path.isfile(os.path.join(log_path, f)) and f[-4:] == '.log' ]:
result[os.path.join(log_path, log)] = _tail(os.path.join(log_path, log), 50) result[os.path.join(log_path, log)] = _tail(os.path.join(log_path, log), int(number))
else: else:
result[log_path] = _tail(log_path, 50) result[log_path] = _tail(log_path, int(number))
else: else:
raise YunoHostError(1, _("Nothing to log for service '%s'") % name) raise YunoHostError(1, _("Nothing to log for service '%s'") % name)