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

fix typo

Browse source
This commit is contained in:
Pierre Bourré 2019-01-23 00:50:45 +01:00
parent 836ec050fb
commit bbb004e056
2 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/actionsmap/yunohost.yml
View file

@ -1150,7 +1150,7 @@ service:
full: --description full: --description
help: Description of the service help: Description of the service
-t: -t:
full: --type_log full: --log_type
help: Type of the log (file or systemd) help: Type of the log (file or systemd)
nargs: "+" nargs: "+"
choices: choices:

20
src/yunohost/service.py
View file

@ -49,7 +49,7 @@ MOULINETTE_LOCK = "/var/run/moulinette_yunohost.lock"
logger = log.getActionLogger('yunohost.service') logger = log.getActionLogger('yunohost.service')
def service_add(name, status=None, log=None, runlevel=None, need_lock=False, description=None, type_log="file"): def service_add(name, status=None, log=None, runlevel=None, need_lock=False, description=None, log_type="file"):
""" """
Add a custom service Add a custom service
@ -60,7 +60,7 @@ def service_add(name, status=None, log=None, runlevel=None, need_lock=False, des
runlevel -- Runlevel priority of the service runlevel -- Runlevel priority of the service
need_lock -- Use this option to prevent deadlocks if the service does invoke yunohost commands. need_lock -- Use this option to prevent deadlocks if the service does invoke yunohost commands.
description -- description of the service description -- description of the service
type_log -- Precise if the corresponding log is a file or a systemd log log_type -- Precise if the corresponding log is a file or a systemd log
""" """
services = _get_services() services = _get_services()
@ -75,14 +75,14 @@ def service_add(name, status=None, log=None, runlevel=None, need_lock=False, des
services[name]['log'] = log services[name]['log'] = log
if not isinstance(type_log, list): if not isinstance(log_type, list):
type_log = [type_log] log_type = [log_type]
if len(type_log) < len(log): if len(log_type) < len(log):
type_log.extend([type_log[-1]] * (len(log) - len(type_log))) # extend list to have the same size as log log_type.extend([log_type[-1]] * (len(log) - len(log_type))) # extend list to have the same size as log
if len(type_log) == len(log): if len(log_type) == len(log):
services[name]['type_log'] = type_log services[name]['log_type'] = log_type
else: else:
raise YunohostError('service_add_failed', service=name) raise YunohostError('service_add_failed', service=name)
@ -383,13 +383,13 @@ def service_log(name, number=50):
raise YunohostError('service_no_log', service=name) raise YunohostError('service_no_log', service=name)
log_list = services[name]['log'] log_list = services[name]['log']
type_log_list = services[name]['type_log'] log_type_list = services[name]['log_type']
result = {} result = {}
for index in range(len(log_list)): for index in range(len(log_list)):
log_path = log_list[index] log_path = log_list[index]
log_type = type_log_list[index] log_type = log_type_list[index]
if log_type == "file": if log_type == "file":
# log is a file, read it # log is a file, read it