Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2f75bcc

Browse files
author
Arnon Yaari
committed
use logging instead of printing to stderr
1 parent cd20e35 commit 2f75bcc

File tree

3 files changed

+28
-16
lines changed

3 files changed

+28
-16
lines changed

zerorpc/channel.py

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,11 @@
3232

3333
from .exceptions import TimeoutExpired
3434

35+
from logging import getLogger
36+
37+
logger = getLogger(__name__)
38+
39+
3540

3641
class ChannelMultiplexer(object):
3742
def __init__(self, events, ignore_broadcast=False):
@@ -76,9 +81,9 @@ def _channel_dispatcher(self):
7681
try:
7782
event = self._events.recv()
7883
except Exception as e:
79-
print >> sys.stderr, \
80-
'zerorpc.ChannelMultiplexer,', \
81-
'ignoring error on recv: {0}'.format(e)
84+
logger.error( \
85+
'zerorpc.ChannelMultiplexer, ' + \
86+
'ignoring error on recv: {0}'.format(e))
8287
continue
8388
channel_id = event.header.get('response_to', None)
8489

@@ -91,10 +96,10 @@ def _channel_dispatcher(self):
9196
queue = self._broadcast_queue
9297

9398
if queue is None:
94-
print >> sys.stderr, \
95-
'zerorpc.ChannelMultiplexer,', \
96-
'unable to route event:', \
97-
event.__str__(ignore_args=True)
99+
logger.error( \
100+
'zerorpc.ChannelMultiplexer, ' + \
101+
'unable to route event: ' + \
102+
event.__str__(ignore_args=True))
98103
else:
99104
queue.put(event)
100105

@@ -210,9 +215,9 @@ def _recver(self):
210215
try:
211216
self._remote_queue_open_slots += int(event.args[0])
212217
except Exception as e:
213-
print >> sys.stderr, \
214-
'gevent_zerorpc.BufferedChannel._recver,', \
215-
'exception:', e
218+
logger.error( \
219+
'gevent_zerorpc.BufferedChannel._recver, ' + \
220+
'exception: ' + repr(e))
216221
if self._remote_queue_open_slots > 0:
217222
self._remote_can_recv.set()
218223
elif self._input_queue.qsize() == self._input_queue_size:

zerorpc/core.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
from .context import Context
4040
from .decorators import DecoratorBase, rep
4141
import patterns
42+
from logging import getLogger
43+
44+
logger = getLogger(__name__)
45+
4246

4347
class ServerBase(object):
4448

@@ -118,7 +122,7 @@ def __call__(self, method, *args):
118122
return self._methods[method](*args)
119123

120124
def _print_traceback(self, protocol_v1, exc_infos):
121-
traceback.print_exception(*exc_infos, file=sys.stderr)
125+
logger.exception('')
122126

123127
exc_type, exc_value, exc_traceback = exc_infos
124128
if protocol_v1:
@@ -337,7 +341,7 @@ def _receiver(self):
337341
except Exception:
338342
exc_infos = sys.exc_info()
339343
try:
340-
traceback.print_exception(*exc_infos, file=sys.stderr)
344+
logger.exception('')
341345
self._context.hook_server_inspect_exception(event, None, exc_infos)
342346
finally:
343347
del exc_infos

zerorpc/gevent_zmq.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
import gevent.core
3535
import sys
3636
import errno
37+
from logging import getLogger
38+
39+
logger = getLogger(__name__)
3740

3841
class Context(_zmq.Context):
3942

@@ -125,8 +128,8 @@ def send(self, data, flags=0, copy=True, track=False):
125128
gevent.sleep(0)
126129
while not self._writable.wait(timeout=1):
127130
if self.getsockopt(_zmq.EVENTS) & _zmq.POLLOUT:
128-
print>>sys.stderr, "/!\\ gevent_zeromq BUG /!\\ " \
129-
"catching up after missing event (SEND) /!\\"
131+
logger.error("/!\\ gevent_zeromq BUG /!\\ " + \
132+
"catching up after missing event (SEND) /!\\")
130133
break
131134

132135
def recv(self, flags=0, copy=True, track=False):
@@ -161,6 +164,6 @@ def recv(self, flags=0, copy=True, track=False):
161164
gevent.sleep(0)
162165
while not self._readable.wait(timeout=1):
163166
if self.getsockopt(_zmq.EVENTS) & _zmq.POLLIN:
164-
print>>sys.stderr, "/!\\ gevent_zeromq BUG /!\\ " \
165-
"catching up after missing event (RECV) /!\\"
167+
logger.error("/!\\ gevent_zeromq BUG /!\\ " + \
168+
"catching up after missing event (RECV) /!\\")
166169
break

0 commit comments

Comments
 (0)