mirror of
https://github.com/zeromq/libzmq.git
synced 2024-12-25 22:30:51 +08:00
Merge pull request #4721 from githejie/reconnect_options
Fix issue with ZMQ_RECONNECT_STOP_AFTER_DISCONNECT option
This commit is contained in:
commit
6aaafe0135
@ -228,7 +228,8 @@ zmq::socket_base_t::socket_base_t (ctx_t *parent_,
|
||||
_monitor_events (0),
|
||||
_thread_safe (thread_safe_),
|
||||
_reaper_signaler (NULL),
|
||||
_monitor_sync ()
|
||||
_monitor_sync (),
|
||||
_disconnected (false)
|
||||
{
|
||||
options.socket_id = sid_;
|
||||
options.ipv6 = (parent_->get (ZMQ_IPV6) != 0);
|
||||
|
@ -246,6 +246,46 @@ void reconnect_stop_on_handshake_failed ()
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_HAVE_IPC)
|
||||
// test stopping reconnect after disconnect
|
||||
void reconnect_stop_after_disconnect ()
|
||||
{
|
||||
// Setup sub socket
|
||||
void *sub = test_context_socket (ZMQ_SUB);
|
||||
// Monitor all events on sub
|
||||
TEST_ASSERT_SUCCESS_ERRNO (
|
||||
zmq_socket_monitor (sub, "inproc://monitor-sub", ZMQ_EVENT_ALL));
|
||||
// Create socket for collecting monitor events
|
||||
void *sub_mon = test_context_socket (ZMQ_PAIR);
|
||||
// Connect so they'll get events
|
||||
TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_mon, "inproc://monitor-sub"));
|
||||
// Set option to stop reconnecting after disconnect
|
||||
int stopReconnectAfterDisconnect = ZMQ_RECONNECT_STOP_AFTER_DISCONNECT;
|
||||
TEST_ASSERT_SUCCESS_ERRNO (
|
||||
zmq_setsockopt (sub, ZMQ_RECONNECT_STOP, &stopReconnectAfterDisconnect,
|
||||
sizeof (stopReconnectAfterDisconnect)));
|
||||
|
||||
// Connect to a dummy that cannot be connected
|
||||
TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub, "ipc://@dummy"));
|
||||
|
||||
// Confirm that connect failed and reconnect
|
||||
expect_monitor_event (sub_mon, ZMQ_EVENT_CLOSED);
|
||||
expect_monitor_event (sub_mon, ZMQ_EVENT_CONNECT_RETRIED);
|
||||
|
||||
// Disconnect the sub socket
|
||||
TEST_ASSERT_SUCCESS_ERRNO (zmq_disconnect (sub, "ipc://@dummy"));
|
||||
|
||||
// Confirm that connect failed and will not reconnect
|
||||
expect_monitor_event (sub_mon, ZMQ_EVENT_CLOSED);
|
||||
|
||||
// Close sub
|
||||
test_context_socket_close_zero_linger (sub);
|
||||
|
||||
// Close monitor
|
||||
test_context_socket_close_zero_linger (sub_mon);
|
||||
}
|
||||
#endif
|
||||
|
||||
void setUp ()
|
||||
{
|
||||
setup_test_context ();
|
||||
@ -267,6 +307,9 @@ int main (void)
|
||||
#ifdef ZMQ_BUILD_DRAFT_API
|
||||
RUN_TEST (reconnect_stop_on_refused);
|
||||
RUN_TEST (reconnect_stop_on_handshake_failed);
|
||||
#endif
|
||||
#if defined(ZMQ_BUILD_DRAFT_API) && defined(ZMQ_HAVE_IPC)
|
||||
RUN_TEST (reconnect_stop_after_disconnect);
|
||||
#endif
|
||||
return UNITY_END ();
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user