Merge lp:~verterok/charms/trusty/haproxy/fix-rsyslog-restart-on-pkg-upgrade into lp:~tanuki/charms/trusty/haproxy/trunk

[Guillermo Gonzalez]

Fix if/else ordering in config check (bug introduced in the last changes)

Fix if/else ordering in config check (bug introduced in the last changes)

[Thomi Richards (thomir-deactivatedaccount)]

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-09-22 21:10:38 +0000
+++ hooks/hooks.py	2015-09-23 21:14:40 +0000
@@ -957,18 +957,18 @@
         if not (get_listen_stanzas() == old_stanzas):
             notify_website()
             notify_peer()
+    else:
+        # XXX Ideally the config should be restored to a working state if the
+        # check fails, otherwise an inadvertent reload will cause the service
+        # to be broken.
+        log("HAProxy configuration check failed, exiting.")
+        sys.exit(1)
     if config_data.changed("global_log") or config_data.changed("source"):
         # restart rsyslog to pickup haproxy rsyslog config
         # This could be removed once the following bug is fixed in the haproxy
         # package:
         #   https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=790871
         service_restart("rsyslog")
-    else:
-        # XXX Ideally the config should be restored to a working state if the
-        # check fails, otherwise an inadvertent reload will cause the service
-        # to be broken.
-        log("HAProxy configuration check failed, exiting.")
-        sys.exit(1)
 
 
 def start_hook():