diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-09 18:40:22 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-09 18:40:22 +0000 |
| commit | 6bbe8d1ac64a0e8e560de257efaa4446d27cb946 (patch) | |
| tree | 392390bcc66bafc96e855c3eb7aeecee6b42e1cc /oslo_messaging | |
| parent | f30225331581ecb2111797309c43206625d11a4c (diff) | |
| parent | 16ce974d97b99e64bacb1add14832529e37a2572 (diff) | |
| download | oslo-messaging-6bbe8d1ac64a0e8e560de257efaa4446d27cb946.tar.gz | |
Merge "[zmq] Remove ZmqSocket.close_linger attribute"
Diffstat (limited to 'oslo_messaging')
| -rw-r--r-- | oslo_messaging/_drivers/zmq_driver/zmq_options.py | 2 | ||||
| -rw-r--r-- | oslo_messaging/_drivers/zmq_driver/zmq_socket.py | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/oslo_messaging/_drivers/zmq_driver/zmq_options.py b/oslo_messaging/_drivers/zmq_driver/zmq_options.py index e754c86..8ab87de 100644 --- a/oslo_messaging/_drivers/zmq_driver/zmq_options.py +++ b/oslo_messaging/_drivers/zmq_driver/zmq_options.py @@ -56,7 +56,7 @@ zmq_opts = [ help='Name of this node. Must be a valid hostname, FQDN, or ' 'IP address. Must match "host" option, if running Nova.'), - cfg.IntOpt('rpc_zmq_linger', default=-1, + cfg.IntOpt('zmq_linger', default=-1, deprecated_group='DEFAULT', deprecated_name='rpc_cast_timeout', help='Number of seconds to wait before all pending ' diff --git a/oslo_messaging/_drivers/zmq_driver/zmq_socket.py b/oslo_messaging/_drivers/zmq_driver/zmq_socket.py index 0fc3d10..56a9d35 100644 --- a/oslo_messaging/_drivers/zmq_driver/zmq_socket.py +++ b/oslo_messaging/_drivers/zmq_driver/zmq_socket.py @@ -46,12 +46,12 @@ class ZmqSocket(object): self.handle = context.socket(socket_type) self.handle.set_hwm(high_watermark) - self.close_linger = -1 - if self.conf.oslo_messaging_zmq.rpc_zmq_linger >= 0: + # Set linger period + linger = -1 + if self.conf.oslo_messaging_zmq.zmq_linger >= 0: # Convert seconds to milliseconds - self.close_linger = \ - self.conf.oslo_messaging_zmq.rpc_zmq_linger * 1000 - self.handle.setsockopt(zmq.LINGER, self.close_linger) + linger = self.conf.oslo_messaging_zmq.zmq_linger * 1000 + self.handle.setsockopt(zmq.LINGER, linger) # Put messages to only connected queues self.handle.setsockopt(zmq.IMMEDIATE, 1 if immediate else 0) |