Merge lp:~tribaal/charms/trusty/landscape-client/additional-logging into lp:charms/trusty/landscape-client

[Chris Glass]

This branch adds more logging to the landscape-client charm (to help narrow a race condition).

[Adam Collard (adam-collard)]

Minor comments about the messages below

review: Approve

[lp:~tribaal/charms/trusty/landscape-client/additional-logging]

43. By Chris Glass on 2014-06-20

Addressed review comments

[Free Ekanayaka (free.ekanayaka)]

Have comments on the messages too. +1 otherwise

review: Approve

[lp:~tribaal/charms/trusty/landscape-client/additional-logging]

44. By Chris Glass on 2014-06-23

Addressed review comments

=== modified file 'hooks/common.py'
--- hooks/common.py	2014-06-13 15:43:58 +0000
+++ hooks/common.py	2014-06-23 11:26:19 +0000
@@ -5,6 +5,9 @@
 from pwd import getpwnam
 from subprocess import check_output
 
+from charmhelpers.core.hookenv import (
+    log, local_unit)
+
 from landscape.configuration import (
     setup, register, LandscapeSetupConfiguration, ConfigurationError,
     stop_client_and_disable_init_script)
@@ -52,6 +55,7 @@
 
     def __init__(self):
         self.config = Configuration()
+        self.local_unit = local_unit()
 
     def update_client_config(self, service_config, try_to_register=True):
         """Update the client config.
@@ -123,10 +127,18 @@
         If an error is encountered, the client will be disabled and the hook
         calling this function will exit with an error code.
         """
+        log("Updating client configuration for %s" % self.local_unit)
         error_handler = ErrorHandler()
 
         sysvconfig = SysVConfig()
         configured = sysvconfig.is_configured_to_run()
+        if configured:
+            log("%s: landscape-client is configured to run as per sysvconfig"
+                "" % self.local_unit)
+        else:
+            log("%s: landscape-client is not configured to run as per "
+                "sysvconfig" % self.local_unit)
+
         config = LandscapeSetupConfiguration()
         config.load([])
         config.silent = True
@@ -139,6 +151,7 @@
             print >> sys.stderr, "Configuration error: %s" % (str(error),)
             error_handler.flag_error(1)
         else:
+            log("Registering %s" % self.local_unit)
             register(config, on_error=error_handler.flag_error)
         return error_handler.exit_code
 

=== modified file 'hooks/hooks.py'
--- hooks/hooks.py	2014-06-13 15:43:58 +0000
+++ hooks/hooks.py	2014-06-23 11:26:19 +0000
@@ -7,7 +7,7 @@
 import subprocess
 
 from charmhelpers.core.hookenv import (
-    Hooks, UnregisteredHookError, log)
+    Hooks, UnregisteredHookError, log, local_unit)
 from charmhelpers.fetch import (
     apt_install, _run_apt_command, add_source, apt_update)
 from charmhelpers.core.hookenv import config
@@ -70,6 +70,7 @@
     @param relation_data: data from the context of a relation, it should
                           match the data in the config
     """
+    log("In config-changed for %s" % local_unit())
     if relation_data is None:
         relation_data = {}
     service_config = juju_broker.get_service_config()
@@ -95,6 +96,7 @@
 @hooks.hook("container-relation-joined", "ceph-client-relation-joined")
 def container_relation_joined(juju_broker=JUJU_BROKER,
                               landscape_broker=LANDSCAPE_BROKER):
+    log("In container-relation-joined for %s" % local_unit())
     landscape_broker.config.reload()
     relation_conf = juju_broker.get_relation_config()
     remote_unit_name = juju_broker.environment.get("JUJU_REMOTE_UNIT")