Merge ~hloeung/mailman3-core-charm:fixes into mailman3-core-charm:master

[Haw Loeung]

Fix setting of active status so it's not stuck with stale/old status; also include commit/revision in status msg

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

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

[🤖 Canonical IS Review Bot (canonical-is-reviewbot)]

Proxy approval for jsimpso

review: Approve

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

Change successfully merged at revision 753210244a0b27fa5849bb4a451bbc759604816b

diff --git a/reactive/mailman3_core.py b/reactive/mailman3_core.py
index da3c707..4b870ba 100644
--- a/reactive/mailman3_core.py
+++ b/reactive/mailman3_core.py
@@ -55,6 +55,7 @@ def initial_setup():
 @when('apt.installed.postfix')
 @when_not('mailman.postfix.configured')
 def configure_postfix():
+    clear_flag('mailman3-core.active')
     config = hookenv.config()
     hookenv.status_set('maintenance', 'configuring postfix for posts to mailing lists')
 
@@ -125,7 +126,25 @@ def configure_postfix():
     # Open the SMTP port
     hookenv.open_port(25)
     set_flag('mailman.postfix.configured')
-    hookenv.status_set('active', 'ready')
+
+
+@when('mailman.postfix.configured')
+@when_not('mailman3-core.active')
+def set_active(version_file='version'):
+    revision = ''
+    if os.path.exists(version_file):
+        with open(version_file) as f:
+            line = f.readline().strip()
+        # We only want the first 10 characters, that's enough to tell
+        # which version of the charm we're using. But include the
+        # entire version if it's 'dirty' according to charm build.
+        if len(line) > 10 and not line.endswith('-dirty'):
+            revision = ' (source version/commit {}…)'.format(line[:10])
+        else:
+            revision = ' (source version/commit {})'.format(line)
+
+    hookenv.status.active('Ready{}'.format(revision))
+    set_flag('mailman3-core.active')
 
 
 # Configure smtpd_recipient_restrictions depending on if SPF is enabled
@@ -243,10 +262,10 @@ def configure_database(pgsql):
 @when('db.master.available')
 @when('config.changed')
 def write_updated_config():
+    clear_flag('mailman3-core.active')
     hookenv.status_set('maintenance', 'updating configuration')
     clear_flag('mailman.postfix.configured')
     write_config()
-    hookenv.status_set('active', 'ready')
 
 
 # Make sure we've got our REST API creds, then publish our relation data.
@@ -316,6 +335,7 @@ def setup_nagios(nagios):
     if hookenv.hook_name() == 'update-status':
         return
 
+    clear_flag('mailman3-core.active')
     hookenv.status_set('maintenance', 'setting up NRPE checks')
     # Ask charmhelpers.contrib.charmsupport's nrpe to work out our hostname
     hostname = nrpe.get_nagios_hostname()
@@ -339,7 +359,6 @@ def setup_nagios(nagios):
     nrpe_setup.add_check('postfix_port', 'Check postfix port', postfix_check)
 
     nrpe_setup.write()
-    hookenv.status_set('active', 'ready')
 
 
 def systemctl(action, service_name):