generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-02-28 18:35:41 +01:00
Code Issues Projects Releases Wiki Activity

Problem: formatting errors

Browse Source 
Solution: run make clang-format-diff
This commit is contained in:
Luca Boccassi 2020-06-26 23:45:39 +01:00
parent c04f6581e0
commit 1ddfeb56ec
4 changed files with 138 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/stream_engine_base.cpp
View File

@ -698,7 +698,8 @@ void zmq::stream_engine_base_t::error (error_reason_t reason_)
// 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)) {
&& (_options.reconnect_stop
& ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED)) {
reason_ = protocol_error;
}
}

5
tests/test_reconnect_options.cpp
View File

@ -240,9 +240,8 @@ void reconnect_stop_on_handshake_failed ()
TEST_ASSERT_SUCCESS_ERRNO (zmq_connect (sub_mon, "inproc://monitor-sub"));
// set handshake interval (i.e., timeout) to a more reasonable value
int handshakeInterval = 1000;
TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_HANDSHAKE_IVL,
&handshakeInterval,
sizeof (handshakeInterval)));
TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (
sub, ZMQ_HANDSHAKE_IVL, &handshakeInterval, sizeof (handshakeInterval)));
// set option to stop reconnecting on failed handshake
int stopReconnectOnError = ZMQ_RECONNECT_STOP_HANDSHAKE_FAILED;
TEST_ASSERT_SUCCESS_ERRNO (zmq_setsockopt (sub, ZMQ_RECONNECT_STOP,

56
tests/testutil_monitoring.cpp
View File

@ -348,22 +348,38 @@ void expect_monitor_event_v2 (void *monitor_,
const char *get_zmqEventName (uint64_t event)
{
switch (event) {
case ZMQ_EVENT_CONNECTED : return "CONNECTED";
case ZMQ_EVENT_CONNECT_DELAYED : return "CONNECT_DELAYED";
case ZMQ_EVENT_CONNECT_RETRIED : return "CONNECT_RETRIED";
case ZMQ_EVENT_LISTENING : return "LISTENING";
case ZMQ_EVENT_BIND_FAILED : return "BIND_FAILED";
case ZMQ_EVENT_ACCEPTED : return "ACCEPTED";
case ZMQ_EVENT_ACCEPT_FAILED : return "ACCEPT_FAILED";
case ZMQ_EVENT_CLOSED : return "CLOSED";
case ZMQ_EVENT_CLOSE_FAILED : return "CLOSE_FAILED";
case ZMQ_EVENT_DISCONNECTED : return "DISCONNECTED";
case ZMQ_EVENT_MONITOR_STOPPED : return "MONITOR_STOPPED";
case ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL : return "HANDSHAKE_FAILED_NO_DETAIL";
case ZMQ_EVENT_HANDSHAKE_SUCCEEDED : return "HANDSHAKE_SUCCEEDED";
case ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL : return "HANDSHAKE_FAILED_PROTOCOL";
case ZMQ_EVENT_HANDSHAKE_FAILED_AUTH : return "HANDSHAKE_FAILED_AUTH";
default : return "UNKNOWN";
case ZMQ_EVENT_CONNECTED:
return "CONNECTED";
case ZMQ_EVENT_CONNECT_DELAYED:
return "CONNECT_DELAYED";
case ZMQ_EVENT_CONNECT_RETRIED:
return "CONNECT_RETRIED";
case ZMQ_EVENT_LISTENING:
return "LISTENING";
case ZMQ_EVENT_BIND_FAILED:
return "BIND_FAILED";
case ZMQ_EVENT_ACCEPTED:
return "ACCEPTED";
case ZMQ_EVENT_ACCEPT_FAILED:
return "ACCEPT_FAILED";
case ZMQ_EVENT_CLOSED:
return "CLOSED";
case ZMQ_EVENT_CLOSE_FAILED:
return "CLOSE_FAILED";
case ZMQ_EVENT_DISCONNECTED:
return "DISCONNECTED";
case ZMQ_EVENT_MONITOR_STOPPED:
return "MONITOR_STOPPED";
case ZMQ_EVENT_HANDSHAKE_FAILED_NO_DETAIL:
return "HANDSHAKE_FAILED_NO_DETAIL";
case ZMQ_EVENT_HANDSHAKE_SUCCEEDED:
return "HANDSHAKE_SUCCEEDED";
case ZMQ_EVENT_HANDSHAKE_FAILED_PROTOCOL:
return "HANDSHAKE_FAILED_PROTOCOL";
case ZMQ_EVENT_HANDSHAKE_FAILED_AUTH:
return "HANDSHAKE_FAILED_AUTH";
default:
return "UNKNOWN";
}
}
@ -372,14 +388,14 @@ void print_events(void* socket, int timeout, int limit)
// print events received
int value;
char *event_address;
int event = get_monitor_event_with_timeout (socket, &value, &event_address,
timeout);
int i = 0;;
int event =
get_monitor_event_with_timeout (socket, &value, &event_address, timeout);
int i = 0;
;
while ((event != -1) && (++i < limit)) {
const char *eventName = get_zmqEventName (event);
printf ("Got event: %s\n", eventName);
event = get_monitor_event_with_timeout (socket, &value, &event_address,
timeout);
}
}