Merge lp:~cprov/charms/trusty/tanuki-spec-manager/store-poller-fixes into lp:~tanuki/charms/trusty/tanuki-spec-manager/trunk

[Celso Providelo]

Fixing upgrading issue (empty hookenv.Config(), using global config) and also adjusting store-poller cron template to benefit of new logging support.

Fixing upgrading issue (empty hookenv.Config(), using global config) and also adjusting store-poller cron template to benefit of new logging support.

[Thomi Richards (thomir-deactivatedaccount)]

LGTM

review: Approve

=== modified file 'hooks/actions.py'
--- hooks/actions.py	2015-09-17 01:09:03 +0000
+++ hooks/actions.py	2015-09-17 04:18:22 +0000
@@ -328,22 +328,17 @@
 
     if local_unit == config_unit:
         environment = hookenv.Config()['environment']
-        log_path = os.path.join('/srv/spec-manager/', environment, 'logs/store_poller.log')
+        log_path = os.path.join(LOG_DIR, 'store-poller.log')
         # Create the file now, so the nagios check doesn't fail right after
         # we've completed the deployment.
         host.write_file(log_path,"", "www-data", "www-data")
+        max_age_seconds = int(config['store_poller_nagios_file_age_max_minutes']) * 60
         nrpe_compat.add_check(
             shortname="store_poller_check",
             description="Store poller check.",
             check_cmd="/usr/lib/nagios/plugins/check_file_age -w {0} -c {0} -f {1}".format(
-                get_poll_frequency_in_seconds(),
+                max_age_seconds,
                 log_path,
             )
         )
     nrpe_compat.write()
-
-
-def get_poll_frequency_in_seconds():
-    config = hookenv.Config()
-    max_age_minutes = int(config['store_poller_nagios_file_age_max_minutes'])
-    return max_age_minutes * 60

=== modified file 'templates/store-poller.cron'
--- templates/store-poller.cron	2015-09-16 05:34:29 +0000
+++ templates/store-poller.cron	2015-09-17 04:18:22 +0000
@@ -3,5 +3,4 @@
 # Run installed `store_poller.py` script according
 # to charm configuration. 
 
-{{ store_poller_frequency }} www-data run-one sh -c 'cd /srv/spec-manager/{{ environment }}/spec-manager && ./env/bin/python3 scripts/store_poller.py -c service.conf' 2>&1 >> /srv/spec-manager/{{ environment }}/logs/store_poller.log
-
+{{ store_poller_frequency }} www-data run-one sh -c 'cd /srv/spec-manager/{{ environment }}/spec-manager && LOG_DIR=../logs ./env/bin/python3 scripts/store_poller.py -c service.conf' 2>&1 >> /dev/null