Merge lp:~tcuthbert/turku-charms/turku-api-charm into lp:turku-charms/turku-api-charm

[Thomas Cuthbert]

We want to wrap the execution of the script with a shell wrapper to handle mutual exclusion and a timeout

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Unable to determine commit message from repository - please click "Set commit message" and enter the commit message manually.

[Barry Price (barryprice)]

LGTM +1

review: Approve

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 11

=== added file 'files/sick_sources'
--- files/sick_sources	1970-01-01 00:00:00 +0000
+++ files/sick_sources	2021-02-05 04:25:50 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -eu
+
+test -x /srv/turku.admin.canonical.com/code/current/turku_api/scripts/turku_sick_sources || exit 1
+test -d /var/lib/turku_sick_sources || mkdir /var/lib/turku_sick_sources
+
+/usr/bin/flock -w 30 /var/run/turku_sick_sources.lock  \
+    /srv/turku.admin.canonical.com/code/current/turku_api/scripts/turku_sick_sources \
+    --metrics_dir /var/lib/turku_sick_sources > /dev/null
+exit 0
 
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2021-02-05 02:24:27 +0000
+++ hooks/hooks.py	2021-02-05 04:25:50 +0000
@@ -16,16 +16,16 @@
 
 def am_i_leader():
     """Calls the is-leader juju helper to determine if server is current leader"""
-    string_to_boolean = {'True': True, 'False': False}
-    call_out = None
+    string_to_boolean = {'true': True, 'false': False}
+    stdout = None
     is_leader = False
     try:
-        call_out = subprocess.run(['is-leader'], check=True, text=True, timeout=15.0)
-        is_leader = string_to_boolean[call_out.STDOUT]
+        stdout = subprocess.check_output(['is-leader']).decode().rstrip()
+        is_leader = string_to_boolean[stdout.lower()]
     except KeyError:
-        juju_log('ERROR', 'is-leader juju helper returned unexpected value: {}'.format(call_out))
-    except subprocess.CalledProcessError:
-        juju_log('ERROR', 'is-leader juju helper failed to execute: {}'.format(call_out.STDOUT + call_out.STDERR))
+        juju_log('ERROR', 'is-leader juju helper returned unexpected value: {}'.format(stdout))
+    except subprocess.CalledProcessError as ce:
+        juju_log('ERROR', 'is-leader juju helper failed to execute: {}'.format(ce))
     return is_leader
 
 
@@ -52,7 +52,11 @@
 @hooks.hook('leader-elected', 'leader-settings-changed')
 def leader_elected():
     # This manual hook exists because calling ansible every leadership event is a bad idea.
-    sick_sources_script = '/srv/turku.admin.canonical.com/code/current/turku_api/scripts/turku_sick_sources'
+    abs_path = os.path.abspath(__file__)
+    sick_sources_script = os.path.join(
+        os.path.dirname(os.path.dirname(abs_path)), 'files/sick_sources'
+    )
+
     cron_daily_sick_sources = '/etc/cron.daily/sick_sources'
     is_leader = am_i_leader()
     if is_leader: