Merge pull request #4 from IdanHaim/RavenDB-6332

RavenDB-6332

Author: ayende

pyravendb/connection/requests_factory.py

@@ -29,7 +29,7 @@ def __init__(self, url, database, convention=None, api_key=None, force_get_topol
         self.convention = convention
         if self.convention is None:
             self.convention = DocumentConvention()
-        self.headers = {"Accept": "application/json", "Has-Api-key": True if self.api_key is not None else False,
+        self.headers = {"Accept": "application/json", "Has-Api-key": 'true' if self.api_key is not None else 'false',
                         "Raven-Client-Version": "3.0.0.0"}
         self.replication_topology = IndexQueue()
         self.topology_change_counter = 0
@@ -186,10 +186,7 @@ def update_replication(self, topology_file):
         with open(topology_file, 'w+') as f:
             f.write(json.dumps(self.topology))
             self.replication_topology.queue.clear()
-            for destination in self.topology["Destinations"]:
-                self.replication_topology.put({"url": destination["Url"], "database": destination["Database"],
-                                               "credentials": {"api_key": destination["ApiKey"],
-                                                               "domain": destination["Domain"]}})
+            self._load_topology()
 
     def check_replication_change(self, topology_file):
 
@@ -220,15 +217,19 @@ def get_replication_topology(self):
             try:
                 with open(topology_file, 'r') as f:
                     self.topology = json.loads(f.read())
-                    for destination in self.topology["Destinations"]:
-                        self.replication_topology.put({"url": destination["Url"], "database": destination["Database"],
-                                                       "credentials": {"api_key": destination["ApiKey"],
-                                                                       "domain": destination["Domain"]}})
+                    self._load_topology()
             except IOError:
                 pass
 
         self.check_replication_change(topology_file)
 
+    def _load_topology(self):
+        for destination in self.topology["Destinations"]:
+            if not destination["Disabled"] and not destination["IgnoredClient"]:
+                self.replication_topology.put({"url": destination["Url"], "database": destination["Database"],
+                                               "credentials": {"api_key": destination["ApiKey"],
+                                                               "domain": destination["Domain"]}})
+
     def do_auth_request(self, api_key, oauth_source, second_api_key=None):
         api_name, secret = api_key.split('/', 1)
         tries = 1