From c618421d6f74c0d8838c1d322304eed8321af27d Mon Sep 17 00:00:00 2001 From: Douglas Young Date: Sat, 5 May 2012 19:03:31 +0100 Subject: Return error if an invalid connection string is used This patch reintroduces the behaviour that if a tcp:// or ipc:// connection string which is invalid is passed to xs_connect, then an error is reported, instead of asserting at connection time --- src/ipc_connecter.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/ipc_connecter.cpp') diff --git a/src/ipc_connecter.cpp b/src/ipc_connecter.cpp index 0722532..f620fd1 100644 --- a/src/ipc_connecter.cpp +++ b/src/ipc_connecter.cpp @@ -39,7 +39,7 @@ xs::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_, class session_base_t *session_, const options_t &options_, - const char *address_, bool wait_) : + bool wait_) : own_t (io_thread_, options_), io_object_t (io_thread_), s (retired_fd), @@ -49,10 +49,6 @@ xs::ipc_connecter_t::ipc_connecter_t (class io_thread_t *io_thread_, current_reconnect_ivl(options.reconnect_ivl), reconnect_timer (NULL) { - // TODO: set_addess should be called separately, so that the error - // can be propagated. - int rc = set_address (address_); - xs_assert (rc == 0); } xs::ipc_connecter_t::~ipc_connecter_t () -- cgit v1.2.3