From 0d210e2e54c0c56fe9a2b65fdce6470cee00a55c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Lebleu?= <jerome@maroufle.fr>
Date: Sat, 4 Jun 2016 22:28:17 +0200
Subject: [PATCH] [ref] Invert no-stats option to with-stats in monitor_enable

Since monitoring statistics was not finished - and by the way not usable,
it inverts the behavior of monitor_enable to disable it by default.
See #395 for more details.
---
 data/actionsmap/yunohost.yml |  6 +++---
 src/yunohost/monitor.py      | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/actionsmap/yunohost.yml b/data/actionsmap/yunohost.yml
index 0280856f3..5a1465258 100644
--- a/data/actionsmap/yunohost.yml
+++ b/data/actionsmap/yunohost.yml
@@ -846,9 +846,9 @@ monitor:
             action_help: Enable server monitoring
             api: PUT /monitor
             arguments:
-                -n:
-                    full: --no-stats
-                    help: Disable monitoring statistics
+                -s:
+                    full: --with-stats
+                    help: Enable monitoring statistics
                     action: store_true
 
         ### monitor_disable()
diff --git a/src/yunohost/monitor.py b/src/yunohost/monitor.py
index 5142c8305..9dfae8573 100644
--- a/src/yunohost/monitor.py
+++ b/src/yunohost/monitor.py
@@ -398,12 +398,12 @@ def monitor_show_stats(period, date=None):
     return result
 
 
-def monitor_enable(no_stats=False):
+def monitor_enable(with_stats=False):
     """
     Enable server monitoring
 
     Keyword argument:
-        no_stats -- Disable monitoring statistics
+        with_stats -- Enable monitoring statistics
 
     """
     from yunohost.service import (service_status, service_enable,
@@ -416,14 +416,14 @@ def monitor_enable(no_stats=False):
         service_enable('glances')
 
     # Install crontab
-    if not no_stats:
-        cmd = 'yunohost monitor update-stats'
+    if with_stats:
         #  day: every 5 min  #  week: every 1 h  #  month: every 4 h  #
-        rules = ('*/5 * * * * root %(cmd)s day >> /dev/null\n' + \
-                 '3 * * * * root %(cmd)s week >> /dev/null\n' + \
-                 '6 */4 * * * root %(cmd)s month >> /dev/null') % {'cmd': cmd}
-        os.system("touch %s" % crontab_path)
-        os.system("echo '%s' >%s" % (rules, crontab_path))
+        rules = ('*/5 * * * * root {cmd} day >> /dev/null\n'
+                 '3 * * * * root {cmd} week >> /dev/null\n'
+                 '6 */4 * * * root {cmd} month >> /dev/null').format(
+                    cmd='/usr/bin/yunohost --quiet monitor update-stats')
+        with open(crontab_path, 'w') as f:
+            f.write(rules)
 
     logger.success(m18n.n('monitor_enabled'))