From 17ca60c3a533072a4eed56da50612c24d0915287 Mon Sep 17 00:00:00 2001 From: Laurent Peuch Date: Fri, 13 May 2016 04:29:08 +0200 Subject: [PATCH] [mod] imports at the beginning of the file --- src/yunohost/monitor.py | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/src/yunohost/monitor.py b/src/yunohost/monitor.py index 7fd5ff8e9..af67d1409 100644 --- a/src/yunohost/monitor.py +++ b/src/yunohost/monitor.py @@ -41,6 +41,9 @@ from moulinette.core import MoulinetteError from moulinette.utils.log import getActionLogger from yunohost.domain import get_public_ip +from yunohost.service import (service_status, service_enable, + service_start, service_disable, service_stop) + logger = getActionLogger('yunohost.monitor') @@ -406,9 +409,6 @@ def monitor_enable(no_stats=False): no_stats -- Disable monitoring statistics """ - from yunohost.service import (service_status, service_enable, - service_start) - glances = service_status('glances') if glances['status'] != 'running': service_start('glances') @@ -433,9 +433,6 @@ def monitor_disable(): Disable server monitoring """ - from yunohost.service import (service_status, service_disable, - service_stop) - glances = service_status('glances') if glances['status'] != 'inactive': service_stop('glances') @@ -467,8 +464,6 @@ def _get_glances_api(): else: return p - from yunohost.service import service_status - if service_status('glances')['status'] != 'running': raise MoulinetteError(errno.EPERM, m18n.n('monitor_not_enabled')) raise MoulinetteError(errno.EIO, m18n.n('monitor_glances_con_failed'))