diff options
| author | Douglas Young <rcxdude@gmail.com> | 2012-05-05 19:03:31 +0100 |
|---|---|---|
| committer | Martin Sustrik <sustrik@250bpm.com> | 2012-05-06 02:22:30 +0200 |
| commit | c618421d6f74c0d8838c1d322304eed8321af27d (patch) | |
| tree | c882fe8e733cc61aa98654154402d70223d0bd4e /src/tcp_connecter.cpp | |
| parent | 4e6a1e5508151d308a53124e4733ae1c1f7b3fb2 (diff) | |
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
Diffstat (limited to 'src/tcp_connecter.cpp')
| -rw-r--r-- | src/tcp_connecter.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/tcp_connecter.cpp b/src/tcp_connecter.cpp index 5ae01e7..c605b8f 100644 --- a/src/tcp_connecter.cpp +++ b/src/tcp_connecter.cpp @@ -47,8 +47,7 @@ #endif xs::tcp_connecter_t::tcp_connecter_t (class io_thread_t *io_thread_, - class session_base_t *session_, const options_t &options_, - const char *address_, bool wait_) : + class session_base_t *session_, const options_t &options_, bool wait_) : own_t (io_thread_, options_), io_object_t (io_thread_), s (retired_fd), @@ -58,10 +57,6 @@ xs::tcp_connecter_t::tcp_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_); - errno_assert (rc == 0); } xs::tcp_connecter_t::~tcp_connecter_t () |