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

Remove service_enable from stuff logged using operation logger ... it's buggy (i18n not working) + doesn't make sense that this one and not service_disable and service add/start/...

Browse source
This commit is contained in:
Alexandre Aubin 2019-08-05 19:10:48 +02:00
parent 302899d12d
commit 1a095f1299
2 changed files with 1 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
locales/en.json
View file

@ -285,7 +285,6 @@
"log_permission_update": "Update permission '{}' for app '{}'", "log_permission_update": "Update permission '{}' for app '{}'",
"log_selfsigned_cert_install": "Install self signed certificate on '{}' domain", "log_selfsigned_cert_install": "Install self signed certificate on '{}' domain",
"log_letsencrypt_cert_renew": "Renew '{}' Let's encrypt certificate", "log_letsencrypt_cert_renew": "Renew '{}' Let's encrypt certificate",
"log_service_enable": "Enable '{}' service",
"log_regen_conf": "Regenerate system configurations '{}'", "log_regen_conf": "Regenerate system configurations '{}'",
"log_user_create": "Add '{}' user", "log_user_create": "Add '{}' user",
"log_user_delete": "Delete '{}' user", "log_user_delete": "Delete '{}' user",

6
src/yunohost/service.py
View file

@ -35,8 +35,6 @@ from moulinette import m18n
from yunohost.utils.error import YunohostError from yunohost.utils.error import YunohostError
from moulinette.utils import log, filesystem from moulinette.utils import log, filesystem
from yunohost.log import is_unit_operation
MOULINETTE_LOCK = "/var/run/moulinette_yunohost.lock" MOULINETTE_LOCK = "/var/run/moulinette_yunohost.lock"
logger = log.getActionLogger('yunohost.service') logger = log.getActionLogger('yunohost.service')
@ -215,8 +213,7 @@ def service_reload_or_restart(names):
raise YunohostError('service_reload_or_restart_failed', service=name, logs=_get_journalctl_logs(name)) raise YunohostError('service_reload_or_restart_failed', service=name, logs=_get_journalctl_logs(name))
@is_unit_operation() def service_enable(names):
def service_enable(operation_logger, names):
""" """
Enable one or more services Enable one or more services
@ -224,7 +221,6 @@ def service_enable(operation_logger, names):
names -- Services name to enable names -- Services name to enable
""" """
operation_logger.start()
if isinstance(names, str): if isinstance(names, str):
names = [names] names = [names]
for name in names: for name in names: