Merge lp:~johnsca/charms/trusty/haproxy/verterok-restart-rsyslog-after-install into lp:~verterok/charms/trusty/haproxy/restart-rsyslog-after-install

[Cory Johns]

Fixed config-changed hook failure, test not catching aforementioned error, and minor lint issue.

[Guillermo Gonzalez (verterok)]

apologize for the delay.

Thanks for fixing this. I worked on a different approach, which is to move the "if config_data.changed("global_log")" outside the if/else.

Will land this and merge my fix later on.

Thanks!

review: Approve

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2015-09-22 21:10:38 +0000
+++ hooks/hooks.py	2015-10-08 16:31:46 +0000
@@ -957,12 +957,12 @@
         if not (get_listen_stanzas() == old_stanzas):
             notify_website()
             notify_peer()
-    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")
+        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
 
=== modified file 'hooks/tests/test_website_hooks.py'
--- hooks/tests/test_website_hooks.py	2015-09-04 19:17:57 +0000
+++ hooks/tests/test_website_hooks.py	2015-10-08 16:31:46 +0000
@@ -147,4 +147,3 @@
                 all_services=""),
             ])
         self.log.assert_has_calls([call("No services configured, exiting.")])
-
 
=== modified file 'tests/10_deploy_test.py'
--- tests/10_deploy_test.py	2015-03-18 20:28:29 +0000
+++ tests/10_deploy_test.py	2015-10-08 16:31:46 +0000
@@ -105,6 +105,8 @@
          'crts': ['DEFAULT'],
          'servers': [['apache', apache_private, 80, 'maxconn 50']]}])
 })
+time.sleep(10)
+d.sentry.wait(seconds)
 
 # We need a retry loop here, since there's no way to tell when the new
 # configuration is in place.
@@ -151,6 +153,8 @@
                   ['apache2', apache_private2, 80, 'maxconn 50']]}
          ]}])
 })
+time.sleep(10)
+d.sentry.wait(seconds)
 
 # Let's exercise our URL-based routing by trying to fetch a URL that will
 # only work for the second apache unit (which is configured as server