diff --git a/ldclient/client.py b/ldclient/client.py index 7934bf87..505e6dc7 100644 --- a/ldclient/client.py +++ b/ldclient/client.py @@ -25,6 +25,7 @@ class Config(object): def __init__(self, base_uri='https://app.launchdarkly.com', + events_uri='https://events.launchdarkly.com', connect_timeout=2, read_timeout=10, upload_limit=100, @@ -54,6 +55,7 @@ def __init__(self, defaults = {} self.base_uri = base_uri.rstrip('\\') + self.events_uri = events_uri.rstrip('\\') self.stream_uri = stream_uri.rstrip('\\') self.stream = stream self.stream_processor_class = RequestsStreamProcessor if not stream_processor_class else stream_processor_class diff --git a/ldclient/requests.py b/ldclient/requests.py index 749163e2..08dd3a24 100644 --- a/ldclient/requests.py +++ b/ldclient/requests.py @@ -127,7 +127,7 @@ def do_send(should_retry): else: body = events hdrs = _headers(self._api_key) - uri = self._config.base_uri + '/api/events/bulk' + uri = self._config.events_uri + '/bulk' r = self._session.post(uri, headers=hdrs, timeout=(self._config.connect, self._config.read), data=json.dumps(body)) r.raise_for_status() diff --git a/ldclient/twisted_impls.py b/ldclient/twisted_impls.py index 1f923bdf..c1835c43 100644 --- a/ldclient/twisted_impls.py +++ b/ldclient/twisted_impls.py @@ -149,7 +149,7 @@ def do_send(should_retry): else: body = events hdrs = _headers(self._api_key) - uri = self._config.base_uri + '/api/events/bulk' + uri = self._config.events_uri + '/bulk' r = yield self._session.post(uri, headers=hdrs, timeout=(self._config.connect, self._config.read), data=json.dumps(body)) r.raise_for_status() diff --git a/testing/server_util.py b/testing/server_util.py index 85a60e85..980a7759 100644 --- a/testing/server_util.py +++ b/testing/server_util.py @@ -88,6 +88,7 @@ def do_nothing(handler): handler.end_headers() self.post_paths["/api/events/bulk"] = do_nothing + self.post_paths["/bulk"] = do_nothing return q def add_feature(self, key, data): diff --git a/testing/test_integration.py b/testing/test_integration.py index 509ac1d2..ca747ce9 100644 --- a/testing/test_integration.py +++ b/testing/test_integration.py @@ -32,14 +32,14 @@ def fin(): def test_toggle(server): server.add_feature("foo", feature("foo", "jim")['foo']) - client = LDClient("apikey", Config(base_uri=server.url)) + client = LDClient("apikey", Config(base_uri=server.url, events_uri=server.url)) wait_until(lambda: client.toggle("foo", user('xyz'), "blah") == "jim") def test_sse_init(server, stream): stream.queue.put(Event(event="put", data=feature("foo", "jim"))) client = LDClient("apikey", Config( - stream=True, base_uri=server.url, stream_uri=stream.url)) + stream=True, base_uri=server.url, events_uri=server.url, stream_uri=stream.url)) wait_until(lambda: client.toggle("foo", user('xyz'), "blah") == "jim")