do not make bucky exit when carbon daemon is down, but eventually dro…

…p data on the floor and lower the default timeout values
trbs · Aug 22, 2014 · 51a5f79 · 51a5f79
1 parent 93558e3
commit 51a5f79
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/bucky/carbon.py b/bucky/carbon.py
@@ -102,10 +102,12 @@ def send(self, host, name, value, mtime):
                 self.sock.sendall(mesg)
                 return
             except socket.error as err:
-                if i + 1 >= self.max_reconnects:
-                    raise
                 log.error("Failed to send data to Carbon server: %s", err)
-                self.reconnect()
+                try:
+                    self.reconnect()
+                except socket.error as err:
+                    log.error("Failed reconnect to Carbon server: %s", err)
+        log.error("Dropping message %s", mesg)
 
 
 class PickleClient(CarbonClient):
@@ -129,7 +131,9 @@ def transmit(self):
                 self.sock.sendall(header + payload)
                 return
             except socket.error as err:
-                if i + 1 >= self.max_reconnects:
-                    raise
                 log.error("Failed to send data to Carbon server: %s", err)
-                self.reconnect()
+                try:
+                    self.reconnect()
+                except socket.error as err:
+                    log.error("Failed reconnect to Carbon server: %s", err)
+        log.error("Dropping buffer!")
diff --git a/bucky/cfg.py b/bucky/cfg.py
@@ -49,8 +49,8 @@
 
 graphite_ip = "127.0.0.1"
 graphite_port = 2003
-graphite_max_reconnects = 1000
-graphite_reconnect_delay = 5
+graphite_max_reconnects = 60
+graphite_reconnect_delay = 1
 graphite_backoff_factor = 1.5
 graphite_backoff_max = 60
 graphite_pickle_enabled = False