Merge pull request #195 from moniker-dns/feature/tcp-transport

josegonzalez · josegonzalez · commit 001d624ee164 · 2013-10-09T07:48:56.000-07:00
Handle publication failures in the TCP transport correctly
diff --git a/beaver/transports/tcp_transport.py b/beaver/transports/tcp_transport.py
@@ -1,8 +1,10 @@
 # -*- coding: utf-8 -*-
 import socket
+import errno
 import time
 
 from beaver.transports.base_transport import BaseTransport
+from beaver.transports.exception import TransportException
 
 
 class TcpTransport(BaseTransport):
@@ -51,5 +53,18 @@ def callback(self, filename, lines, **kwargs):
         if kwargs.get('timestamp', False):
             del kwargs['timestamp']
 
-        for line in lines:
-            self._sock.send(self.format(filename, line, timestamp, **kwargs) + "\n")
+        try:
+            for line in lines:
+                self._sock.send(self.format(filename, line, timestamp, **kwargs) + "\n")
+        except socket.error, e:
+            self.invalidate()
+
+            if isinstance(e.args, tuple):
+                if e[0] == errno.EPIPE:
+                    raise TransportException('Connection appears to have been lost')
+            
+            raise TransportException('Socket Error: %s', e.args)
+        except Exception:
+            self.invalidate()
+
+            raise TransportException('Unspecified exception encountered')  # TRAP ALL THE THINGS!
