Merge pull request #1043 from hurtonm/dont_reconnect_on_protocol_errors

Don't reconnect on protocol errors
This commit is contained in:
Pieter Hintjens 2014-05-18 10:53:32 +02:00
commit 77f5f7adae

View File

@ -376,10 +376,22 @@ void zmq::session_base_t::engine_error (
if (pipe)
clean_pipes ();
if (active)
reconnect ();
else
terminate ();
zmq_assert (reason == stream_engine_t::connection_error
|| reason == stream_engine_t::timeout_error
|| reason == stream_engine_t::protocol_error);
switch (reason) {
case stream_engine_t::timeout_error:
case stream_engine_t::connection_error:
if (active)
reconnect ();
else
terminate ();
break;
case stream_engine_t::protocol_error:
terminate ();
break;
}
// Just in case there's only a delimiter in the pipe.
if (pipe)