Skip to content

Handle publication failures in the TCP transport correctly #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
josegonzalez merged 1 commit into from
Oct 9, 2013
Merged

Handle publication failures in the TCP transport correctly #195

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions beaver/transports/tcp_transport.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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):
Expand Down Expand Up @@ -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!