Merge lp:~hloeung/ubuntu-repository-cache/apache2-restart-on-mpm-changes into lp:ubuntu-repository-cache

[Haw Loeung]

Restart apache2 on MPM changes as required

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

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

[lp:~hloeung/ubuntu-repository-cache/apache2-restart-on-mpm-changes]

294. By Haw Loeung on 2020-12-08

Fixed to clear flag on restart

[Paul Collins (pjdc)]

review: Needs Fixing

[Paul Collins (pjdc)]

My inline comments vanished somewhere, but for the record they were:
 - clear_flag
 - not all settings require a restart (confusingly, Apache docs refer to a graceful as "restart"...)

[lp:~hloeung/ubuntu-repository-cache/apache2-restart-on-mpm-changes]

295. By Haw Loeung on 2020-12-08

Fixed to restrict to limited set of MPM settings that actually requires a full restart

[Paul Collins (pjdc)]

review: Approve (lgtm)

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

Change successfully merged at revision 293

=== modified file 'reactive/ubuntu-repository-cache.py'
--- reactive/ubuntu-repository-cache.py	2020-12-03 04:57:38 +0000
+++ reactive/ubuntu-repository-cache.py	2020-12-08 00:26:18 +0000
@@ -40,6 +40,15 @@
     reactive.clear_flag('nagios-nrpe.configured')
 
 
[e-mail]_any(
+    'config.changed.apache2_mpm_type',
+    'config.changed.apache2_mpm_threadlimit',
+    'config.changed.apache2_mpm_serverlimit',
+)
+def apache2_restart_required():
+    reactive.set_flag('ubuntu-repository-cache.apache2-restart-required')
+
+
 @reactive.when('ubuntu-repository-cache.installed')
 @reactive.when_not('ubuntu-repository-cache.configured')
 def configure_services():
@@ -71,6 +80,14 @@
     hookenv.relation_set(relation_id=relation_id, relation_settings=settings)
 
 
[e-mail]('ubuntu-repository-cache.configured')
[e-mail]('ubuntu-repository-cache.apache2-restart-required')
+def apache2_restart():
+    LOG('Restarting apache2 as MPM settings have changed')
+    host.service_restart('apache2')
+    reactive.clear_flag('ubuntu-repository-cache.apache2-restart-required')
+
+
 @reactive.hook('upgrade-charm')
 def upgrade_charm():
     '''Handle charm updates'''