From 173d32134e95693cf7abd63184c7fe0871bae13c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= Date: Tue, 1 Mar 2016 21:01:32 +0100 Subject: [PATCH] [enh] Replace msignals.display by logging in monitor.py --- src/yunohost/monitor.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/yunohost/monitor.py b/src/yunohost/monitor.py index 9db5e3234..0f3ed912f 100644 --- a/src/yunohost/monitor.py +++ b/src/yunohost/monitor.py @@ -38,8 +38,10 @@ import cPickle as pickle from urllib import urlopen from datetime import datetime, timedelta - from moulinette.core import MoulinetteError +from moulinette.utils.log import getActionLogger + +logger = getActionLogger('yunohost.monitor') glances_uri = 'http://127.0.0.1:61209' stats_path = '/var/lib/yunohost/stats' @@ -419,7 +421,7 @@ def monitor_enable(no_stats=False): os.system("touch %s" % crontab_path) os.system("echo '%s' >%s" % (rules, crontab_path)) - msignals.display(m18n.n('monitor_enabled'), 'success') + logger.success(m18n.n('monitor_enabled')) def monitor_disable(): @@ -437,7 +439,7 @@ def monitor_disable(): try: service_disable('glances') except MoulinetteError as e: - msignals.display(e.strerror, 'warning') + logger.warning(e.strerror) # Remove crontab try: @@ -445,7 +447,7 @@ def monitor_disable(): except: pass - msignals.display(m18n.n('monitor_disabled'), 'success') + logger.success(m18n.n('monitor_disabled')) def _get_glances_api():