From 1a095f12990a42a06281fcd385ff668616e08a29 Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Mon, 5 Aug 2019 19:10:48 +0200 Subject: [PATCH] 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/... --- locales/en.json | 1 - src/yunohost/service.py | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/locales/en.json b/locales/en.json index ecfba2947..7581a68b1 100644 --- a/locales/en.json +++ b/locales/en.json @@ -285,7 +285,6 @@ "log_permission_update": "Update permission '{}' for app '{}'", "log_selfsigned_cert_install": "Install self signed certificate on '{}' domain", "log_letsencrypt_cert_renew": "Renew '{}' Let's encrypt certificate", - "log_service_enable": "Enable '{}' service", "log_regen_conf": "Regenerate system configurations '{}'", "log_user_create": "Add '{}' user", "log_user_delete": "Delete '{}' user", diff --git a/src/yunohost/service.py b/src/yunohost/service.py index c3d78bc1f..17a3cc83e 100644 --- a/src/yunohost/service.py +++ b/src/yunohost/service.py @@ -35,8 +35,6 @@ from moulinette import m18n from yunohost.utils.error import YunohostError from moulinette.utils import log, filesystem -from yunohost.log import is_unit_operation - MOULINETTE_LOCK = "/var/run/moulinette_yunohost.lock" 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)) -@is_unit_operation() -def service_enable(operation_logger, names): +def service_enable(names): """ Enable one or more services @@ -224,7 +221,6 @@ def service_enable(operation_logger, names): names -- Services name to enable """ - operation_logger.start() if isinstance(names, str): names = [names] for name in names: