Commit ec9f8994 authored by Martin Hurton's avatar Martin Hurton

Simplify {tcp|ipc}_connecter

Make start_connecting () to have singe exit point.
parent e0fed9d2
......@@ -142,7 +142,6 @@ void zmq::ipc_connecter_t::start_connecting ()
handle = add_fd (s);
handle_valid = true;
out_event ();
return;
}
// Connection establishment may be delayed. Poll for its completion.
......@@ -151,12 +150,13 @@ void zmq::ipc_connecter_t::start_connecting ()
handle_valid = true;
set_pollout (handle);
session->monitor_event (ZMQ_EVENT_CONNECT_DELAYED, endpoint.c_str(), zmq_errno());
return;
}
// Handle any other error condition by eventual reconnect.
close ();
add_reconnect_timer();
else {
close ();
add_reconnect_timer ();
}
}
void zmq::ipc_connecter_t::add_reconnect_timer()
......
......@@ -155,7 +155,6 @@ void zmq::tcp_connecter_t::start_connecting ()
handle = add_fd (s);
handle_valid = true;
out_event ();
return;
}
// Connection establishment may be delayed. Poll for its completion.
......@@ -164,12 +163,13 @@ void zmq::tcp_connecter_t::start_connecting ()
handle_valid = true;
set_pollout (handle);
session->monitor_event (ZMQ_EVENT_CONNECT_DELAYED, endpoint.c_str(), zmq_errno());
return;
}
// Handle any other error condition by eventual reconnect.
close ();
add_reconnect_timer();
else {
close ();
add_reconnect_timer ();
}
}
void zmq::tcp_connecter_t::add_reconnect_timer()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment