From 406b330048c216a154f5dedab95ed4fca34a9cc5 Mon Sep 17 00:00:00 2001 From: Pieter Date: Sun, 10 Dec 2017 17:10:34 +0100 Subject: [PATCH 1/2] use proper exception for timeout --- zmqrpc/ZmqExceptions.py | 11 +++++++++++ zmqrpc/ZmqSender.py | 3 ++- 2 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 zmqrpc/ZmqExceptions.py diff --git a/zmqrpc/ZmqExceptions.py b/zmqrpc/ZmqExceptions.py new file mode 100644 index 0000000..bb18fbc --- /dev/null +++ b/zmqrpc/ZmqExceptions.py @@ -0,0 +1,11 @@ +''' +Created on Dec 10, 2017 + +@author: Pieter Eendebak + +@copyright: MIT license, see http://opensource.org/licenses/MIT +''' + + +class ZmqTimeoutException(Exception): + pass diff --git a/zmqrpc/ZmqSender.py b/zmqrpc/ZmqSender.py index 874d13b..66ce44e 100644 --- a/zmqrpc/ZmqSender.py +++ b/zmqrpc/ZmqSender.py @@ -10,6 +10,7 @@ import time import zmq +from .ZmqExceptions import ZmqTimeoutException logger = logging.getLogger("zmqrpc") @@ -178,7 +179,7 @@ def _send_over_req_socket(self, message, time_out_waiting_for_response_in_sec=10 return self.handle_response(response_message_json) # Some unexpected socket related error occurred. Recreate the REQ socket. self.recreate_req_socket = True - raise Exception("No response received on ZMQ Request to end point {0} in {1} seconds. Discarding message. Marking REQ socket to be recreated on next try.".format(self.zmq_req_endpoints, time_out_waiting_for_response_in_sec)) + raise ZmqTimeoutException("No response received on ZMQ Request to end point {0} in {1} seconds. Discarding message. Marking REQ socket to be recreated on next try.".format(self.zmq_req_endpoints, time_out_waiting_for_response_in_sec)) def send(self, message, time_out_waiting_for_response_in_sec=60): # Create sockets if needed. Raise an exception if any problems are encountered From e8e04fc3f7870dc618db96c2f0fa91a6befd665f Mon Sep 17 00:00:00 2001 From: Pieter Eendebak Date: Tue, 30 Apr 2019 10:18:21 +0200 Subject: [PATCH 2/2] bump version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 820d6ec..04c94bc 100644 --- a/setup.py +++ b/setup.py @@ -3,7 +3,7 @@ setup( name='pyzmqrpc', packages=['zmqrpc'], - version='2.0.0', + version='2.0.1', include_package_data=True, description='A simple ZMQ RPC extension with JSON for message serialization', author='J Verhoeven',