Merge branch 'hotfix/0.14.2'

Author: cmarat

ers/api.py

@@ -60,7 +60,7 @@ def get_entity(self, entity_name):
                 remote_store = store.RemoteStore(peer['server_url'])
                 remote_docs.extend(remote_store.docs_by_entity(entity_name))
             except:
-                sys.stderr.write("Warning: failed to query remote peer {0}".format(peer))
+                sys.stderr.write("Warning: failed to query remote peer {0}\n".format(peer))
                 continue
             else:
                 for doc in remote_docs:
@@ -86,7 +86,7 @@ def search(self, prop, value=None):
                 remote_store = store.RemoteStore(peer['server_url'])
                 remote_result = set(remote_store.by_property_value(prop, value))
             except:
-                sys.stderr.write("Warning: failed to query remote peer {0}".format(peer))
+                sys.stderr.write("Warning: failed to query remote peer {0}\n".format(peer))
             else:
                 result.update(remote_result)
 

ers/daemon.py

@@ -21,8 +21,9 @@
 import logging.handlers
 
 import gobject
-import zeroconf
+import restkit
 
+import zeroconf
 from store import ServiceStore
 
 ERS_AVAHI_SERVICE_TYPE = '_ers._tcp'
@@ -216,6 +217,8 @@ def _clear_replication(self):
 
     def _update_cache(self):
         cache_contents = self._store.cache_contents()
+        if not cache_contents:
+            return
         for peer in self._peers.values():
             for dbname in ('ers-public', 'ers-cache'):
                 source_db = r'http://{0}:{1}/{2}'.format(peer.ip, peer.port, dbname)

ers/store.py

@@ -209,7 +209,10 @@ def update_replicator_docs(self, repl_docs):
                 repl_docs[doc_id]['_rev'] = doc_rev
             else:
                 repl_docs[doc_id] = {"_id": doc_id, "_rev": doc_rev, "_deleted": True}
-        self.replicator.save_docs(repl_docs.values())
+        try:
+            self.replicator.save_docs(repl_docs.values())
+        except couchdbkit.exceptions.BulkSaveError as e:
+            print "Error while trying to update replicator docs: {}".format(e.errors)
 
 
 RemoteStore = partial(Store, databases=REMOTE_DBS, timeout=REMOTE_SERVER_TIMEOUT)