Merge ~troyanov/maas:fix-http-restart into maas:master

Proposed by Anton Troyanov
Status: Merged
Approved by: Anton Troyanov
Approved revision: 534701f5f781a696cde903a141d1239c5967f8ca
Merge reported by: MAAS Lander
Merged at revision: not available
Proposed branch: ~troyanov/maas:fix-http-restart
Merge into: maas:master
Diff against target: 16 lines (+2/-2)
1 file modified
src/maasserver/regiondservices/http.py (+2/-2)
Reviewer Review Type Date Requested Status
Igor Brovtsin (community) Approve
MAAS Lander Approve
Review via email: mp+448699@code.launchpad.net

Commit message

fix(reverse_proxy): yield service_monitor call

To post a comment you must log in.
Revision history for this message
MAAS Lander (maas-lander) wrote :

UNIT TESTS
-b fix-http-restart lp:~troyanov/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: 534701f5f781a696cde903a141d1239c5967f8ca

review: Approve
Revision history for this message
Igor Brovtsin (igor-brovtsin) wrote :

+1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/src/maasserver/regiondservices/http.py b/src/maasserver/regiondservices/http.py
2index e79aa76..8a3758b 100644
3--- a/src/maasserver/regiondservices/http.py
4+++ b/src/maasserver/regiondservices/http.py
5@@ -120,9 +120,9 @@ class RegionHTTPService(Service):
6 @inlineCallbacks
7 def _reload_service(self):
8 if snap.running_in_snap():
9- service_monitor.restartService("reverse_proxy")
10+ yield service_monitor.restartService("reverse_proxy")
11 else:
12- service_monitor.reloadService("reverse_proxy")
13+ yield service_monitor.reloadService("reverse_proxy")
14 yield deferToDatabase(
15 certificate_expiration_check.check_tls_certificate
16 )

Subscribers

People subscribed via source and target branches