Commit 74ae19ac authored by Sergey KHripchenko's avatar Sergey KHripchenko

spaces deleted

parent 06b2eae8
......@@ -359,7 +359,7 @@ void zmq::pipe_t::terminate (bool delay_)
// active state.
else if (state == delimited) {
send_pipe_term (peer);
state = terminated;
state = terminated;
}
// There are no other states.
......
......@@ -357,6 +357,7 @@ void zmq::session_base_t::proceed_with_term ()
void zmq::session_base_t::timer_event (int id_)
{
// Linger period expired. We can proceed with termination even though
// there are still pending messages to be sent.
zmq_assert (id_ == linger_timer_id);
......@@ -376,13 +377,13 @@ void zmq::session_base_t::detached ()
}
// Reconnect.
if (options.reconnect_ivl != -1)
start_connecting (true);
if (options.reconnect_ivl != -1)
start_connecting (true);
// For subscriber sockets we hiccup the inbound pipe, which will cause
// the socket object to resend all the subscriptions.
if (pipe && (options.type == ZMQ_SUB || options.type == ZMQ_XSUB))
pipe->hiccup ();
pipe->hiccup ();
}
void zmq::session_base_t::start_connecting (bool wait_)
......
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