Merge lp:~verterok/charms/trusty/logstash/update-nrpe_on_config-changed into lp:~tanuki/charms/trusty/logstash/trunk

[Guillermo Gonzalez]

Call hooks/nrpe-external-master-relation-changed at the end of config-changed, and minor fix to client-relation-changed

Call hooks/nrpe-external-master-relation-changed at the end of config-changed, and minor fix to client-relation-changed

[Celso Providelo (cprov)]

+1, yay, sane LS at last.

review: Approve

=== modified file 'hooks/client-relation-changed'
--- hooks/client-relation-changed	2015-09-08 17:11:30 +0000
+++ hooks/client-relation-changed	2015-09-08 20:10:04 +0000
@@ -29,6 +29,8 @@
 def write_config():
     with open('host_cache', 'r') as f:
         hosts = f.readlines()
+    if not hosts:
+        sys.exit(0)
 
     # Use last host in list as it will be the most recently added
     # and first host in list may not exist anymore! TODO fix that.
 
=== modified file 'hooks/config-changed'
--- hooks/config-changed	2015-09-08 17:11:30 +0000
+++ hooks/config-changed	2015-09-08 20:10:04 +0000
@@ -49,7 +49,7 @@
     # Restart the service when configuration has changed.
     subprocess.check_output(shlex.split('hooks/start'))
 
-    # TODO: should call update_nrpe_checks() here.  See charmsupport/nrpe.py
+    subprocess.check_output(shlex.split('hooks/nrpe-external-master-relation-changed'))
 
 
 def copy_config():