generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-11-06 13:21:10 +01:00
Code Issues Projects Releases Wiki Activity

rebase reconnect-redux on master (#3960)

Browse Source 
* add option to stop reconnecting on failed handshake
This commit is contained in:
Bill Torpey
2020-06-26 18:41:44 -04:00
committed by GitHub
parent c7aef56048
commit c04f6581e0
14 changed files with 131 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/stream_engine_base.cpp
View File

@@ -582,6 +582,11 @@ void zmq::stream_engine_base_t::mechanism_ready ()
alloc_assert (_metadata);
}
if (_has_handshake_timer) {
cancel_timer (handshake_timer_id);
_has_handshake_timer = false;
}
_socket->event_handshake_succeeded (_endpoint_uri_pair, 0);
}
@@ -689,6 +694,13 @@ void zmq::stream_engine_base_t::error (error_reason_t reason_)
|| _mechanism->status () == mechanism_t::handshaking)) {
const int err = errno;
_socket->event_handshake_failed_no_detail (_endpoint_uri_pair, err);
// special case: connecting to non-ZMTP process which immediately drops connection,
// or which never responds with greeting, should be treated as a protocol error
// (i.e. stop reconnect)
if ( ( (reason_ == connection_error) || (reason_ == timeout_error) )
&& (_options.reconnect_stop & ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED)) {
reason_ = protocol_error;
}
}
_socket->event_disconnected (_endpoint_uri_pair, _s);