Merge pull request #58 from launchdarkly/dr/indirect

Fix indirect streaming messages.

Author: drichelson

ldclient/__init__.py

@@ -34,7 +34,7 @@ def get():
         global client
         _lock.lock()
         if not client:
-            log.info("Initializing LaunchDarkly Client")
+            log.info("Initializing LaunchDarkly Client " + version.VERSION)
             client = LDClient(sdk_key, config, start_wait)
         return client
     finally:

ldclient/feature_requester.py

@@ -5,6 +5,7 @@
 
 from ldclient.interfaces import FeatureRequester
 from ldclient.util import _headers
+from ldclient.util import log
 
 
 class FeatureRequesterImpl(FeatureRequester):
@@ -16,6 +17,7 @@ def __init__(self, sdk_key, config):
     def get_all(self):
         hdrs = _headers(self._sdk_key)
         uri = self._config.get_latest_features_uri
+        log.debug("Getting all flags using uri: " + uri)
         r = self._session.get(uri, headers=hdrs, timeout=(
             self._config.connect_timeout, self._config.read_timeout))
         r.raise_for_status()
@@ -25,6 +27,7 @@ def get_all(self):
     def get_one(self, key):
         hdrs = _headers(self._sdk_key)
         uri = self._config.get_latest_features_uri + '/' + key
+        log.debug("Getting one feature flag using uri: " + uri)
         r = self._session.get(uri,
                               headers=hdrs,
                               timeout=(self._config.connect_timeout,

ldclient/streaming.py

@@ -46,27 +46,28 @@ def initialized(self):
 
     @staticmethod
     def process_message(store, requester, msg, ready):
-        payload = json.loads(msg.data)
-        log.debug("Received stream event {}".format(msg.event))
+        log.debug("Received stream event {} with data: {}".format(msg.event, msg.data))
         if msg.event == 'put':
+            payload = json.loads(msg.data)
             store.init(payload)
             if not ready.is_set() and store.initialized:
                 log.info("StreamingUpdateProcessor initialized ok")
                 return True
         elif msg.event == 'patch':
+            payload = json.loads(msg.data)
             key = payload['path'][1:]
             feature = payload['data']
-            log.debug("Updating feature {}".format(key))
             store.upsert(key, feature)
         elif msg.event == "indirect/patch":
-            key = payload['data']
+            key = msg.data
             store.upsert(key, requester.get_one(key))
         elif msg.event == "indirect/put":
             store.init(requester.get_all())
             if not ready.is_set() and store.initialized:
                 log.info("StreamingUpdateProcessor initialized ok")
                 return True
         elif msg.event == 'delete':
+            payload = json.loads(msg.data)
             key = payload['path'][1:]
             # noinspection PyShadowingNames
             version = payload['version']