Merge lp:~abentley/charms/trusty/juju-reports/disable-cron into lp:~juju-qa/charms/trusty/juju-reports/trunk

[Aaron Bentley]

cron-interval=-1 disables cron.

This branch tweaks the juju-reports charm to provide a way to disable cron scripts.

Developers will typically want to run the scripts by hand, and not have cron running automatically. Now they can set cron-interval to -1 to achieve that.

[Curtis Hovey (sinzui)]

Thank you

review: Approve (code)

=== modified file 'config.yaml'
--- config.yaml	2015-02-20 19:54:48 +0000
+++ config.yaml	2015-02-25 15:29:08 +0000
@@ -4,6 +4,7 @@
     default: 60
     description: |
       The amount of time (in minutes) between cron jobs for the app.
+      -1 to disable cron.
   source:
     type: string
     default: lp:juju-reports

=== modified file 'hooks/common.py'
--- hooks/common.py	2015-02-20 19:54:48 +0000
+++ hooks/common.py	2015-02-25 15:29:08 +0000
@@ -357,6 +357,9 @@
         hookenv.log('Not setting up cron because {} not set.'.format(
             ', '.join(unset)))
         update_cronjob(None)
+    elif config['cron-interval'] == -1:
+        hookenv.log('Cron disabled by cron-interval = -1')
+        update_cronjob(None)
     else:
         install_cronjob(config['cron-interval'], config['error-email'])
     stop()