Merge lp:~hloeung/ubuntu-repository-cache/units-stuck-in-maintenance into lp:ubuntu-repository-cache

Proposed by Haw Loeung
Status: Merged
Approved by: Barry Price
Approved revision: 333
Merged at revision: 329
Proposed branch: lp:~hloeung/ubuntu-repository-cache/units-stuck-in-maintenance
Merge into: lp:ubuntu-repository-cache
Diff against target: 19 lines (+2/-0)
1 file modified
reactive/ubuntu_repository_cache.py (+2/-0)
To merge this branch: bzr merge lp:~hloeung/ubuntu-repository-cache/units-stuck-in-maintenance
Reviewer Review Type Date Requested Status
Barry Price Approve
Canonical IS Reviewers Pending
Review via email: mp+399324@code.launchpad.net

Commit message

Fix issue with units stuck in maintenance - LP:1918199

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

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

Revision history for this message
Barry Price (barryprice) wrote :

+1

review: Approve
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

Change successfully merged at revision 329

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'reactive/ubuntu_repository_cache.py'
--- reactive/ubuntu_repository_cache.py 2021-02-16 21:29:13 +0000
+++ reactive/ubuntu_repository_cache.py 2021-03-08 22:19:08 +0000
@@ -112,6 +112,7 @@
112@reactive.when('ubuntu-repository-cache.apache2-restart-required')112@reactive.when('ubuntu-repository-cache.apache2-restart-required')
113def apache2_restart():113def apache2_restart():
114 status.maintenance('Restarting apache2 as MPM settings have changed')114 status.maintenance('Restarting apache2 as MPM settings have changed')
115 reactive.clear_flag('ubuntu-repository-cache.active')
115 host.service_restart('apache2')116 host.service_restart('apache2')
116 reactive.clear_flag('ubuntu-repository-cache.apache2-restart-required')117 reactive.clear_flag('ubuntu-repository-cache.apache2-restart-required')
117118
@@ -131,6 +132,7 @@
131 '''Start the charm's services'''132 '''Start the charm's services'''
132133
133 status.maintenance('Starting %s' % SERVICE)134 status.maintenance('Starting %s' % SERVICE)
135 reactive.clear_flag('ubuntu-repository-cache.active')
134 service.render_configs()136 service.render_configs()
135137
136 sync_host = hookenv.config()['sync-host']138 sync_host = hookenv.config()['sync-host']

Subscribers

People subscribed via source and target branches