Skip to content

Commit 828b61d

Browse files
committed
emit now returns success/failure value
1 parent a8a08b0 commit 828b61d

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

fluent/handler.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def __init__(self,
106106

107107
def emit(self, record):
108108
data = self.format(record)
109-
self.sender.emit(None, data)
109+
return self.sender.emit(None, data)
110110

111111
def close(self):
112112
self.acquire()

fluent/sender.py

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def __init__(self,
6161

6262
def emit(self, label, data):
6363
cur_time = int(time.time())
64-
self.emit_with_time(label, cur_time, data)
64+
return self.emit_with_time(label, cur_time, data)
6565

6666
def emit_with_time(self, label, timestamp, data):
6767
try:
@@ -71,7 +71,7 @@ def emit_with_time(self, label, timestamp, data):
7171
{"level": "CRITICAL",
7272
"message": "Can't output to log",
7373
"traceback": traceback.format_exc()})
74-
self._send(bytes_)
74+
return self._send(bytes_)
7575

7676
def close(self):
7777
self.lock.acquire()
@@ -101,7 +101,7 @@ def _make_packet(self, label, timestamp, data):
101101
def _send(self, bytes_):
102102
self.lock.acquire()
103103
try:
104-
self._send_internal(bytes_)
104+
return self._send_internal(bytes_)
105105
finally:
106106
self.lock.release()
107107

@@ -116,16 +116,21 @@ def _send_internal(self, bytes_):
116116

117117
# send finished
118118
self.pendings = None
119+
120+
return True
119121
except socket.error as e:
120122
# close socket
121123
self._close()
124+
122125
# clear buffer if it exceeds max bufer size
123126
if self.pendings and (len(self.pendings) > self.bufmax):
124127
self._call_buffer_overflow_handler(self.pendings)
125128
self.pendings = None
126129
else:
127130
self.pendings = bytes_
128131

132+
return False
133+
129134
def _send_data(self, bytes_):
130135
# reconnect if possible
131136
self._reconnect()

0 commit comments

Comments
 (0)