From 0155949433fbd7632c41dded086a1f02237c3f94 Mon Sep 17 00:00:00 2001 From: Garrett D'Amore Date: Sun, 14 Apr 2024 15:45:52 -0700 Subject: Log rejects by app, bind/listen/connect failures. --- src/core/dialer.c | 5 ++++- src/core/listener.c | 19 ++++++++++++------- src/core/socket.c | 4 +++- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/src/core/dialer.c b/src/core/dialer.c index b1ded52f..ed8577dc 100644 --- a/src/core/dialer.c +++ b/src/core/dialer.c @@ -388,6 +388,9 @@ dialer_connect_cb(void *arg) case NNG_ECONNREFUSED: case NNG_ETIMEDOUT: default: + nng_log_warn("NNG-CONN-FAIL", "Failed connecting to %s: %s", + d->d_url->u_rawurl, nng_strerror(rv)); + nni_dialer_bump_error(d, rv); if (user_aio == NULL) { nni_dialer_timer_start(d); @@ -410,7 +413,7 @@ dialer_connect_start(nni_dialer *d) int nni_dialer_start(nni_dialer *d, unsigned flags) { - int rv = 0; + int rv = 0; nni_aio *aio = NULL; if (nni_atomic_flag_test_and_set(&d->d_started)) { diff --git a/src/core/listener.c b/src/core/listener.c index 53d5c843..a020079d 100644 --- a/src/core/listener.c +++ b/src/core/listener.c @@ -10,6 +10,7 @@ // #include "core/nng_impl.h" +#include "core/strs.h" #include "sockimpl.h" #include @@ -21,7 +22,7 @@ static void listener_accept_start(nni_listener *); static void listener_accept_cb(void *); static void listener_timer_cb(void *); -static nni_id_map listeners = NNI_ID_MAP_INITIALIZER(1, 0x7fffffff, 0); +static nni_id_map listeners = NNI_ID_MAP_INITIALIZER(1, 0x7fffffff, 0); static nni_mtx listeners_lk = NNI_MTX_INITIALIZER; uint32_t @@ -223,12 +224,12 @@ nni_listener_create(nni_listener **lp, nni_sock *s, const char *url_str) nni_url_free(url); return (NNG_ENOMEM); } - l->l_url = url; - l->l_closed = false; - l->l_data = NULL; - l->l_ref = 1; - l->l_sock = s; - l->l_tran = tran; + l->l_url = url; + l->l_closed = false; + l->l_data = NULL; + l->l_ref = 1; + l->l_sock = s; + l->l_tran = tran; nni_atomic_flag_reset(&l->l_started); // Make a copy of the endpoint operations. This allows us to @@ -363,6 +364,8 @@ listener_accept_cb(void *arg) case NNG_ECONNRESET: // remote condition, no cool down case NNG_ETIMEDOUT: // No need to sleep, we timed out already. case NNG_EPEERAUTH: // peer validation failure + nng_log_warn("NNG-ACCEPT-FAIL", "Failed accepting on %s: %s", + l->l_url->u_rawurl, nng_strerror(rv)); nni_listener_bump_error(l, rv); listener_accept_start(l); break; @@ -400,6 +403,8 @@ nni_listener_start(nni_listener *l, int flags) } if ((rv = l->l_ops.l_bind(l->l_data)) != 0) { + nng_log_warn("NNG-BIND-FAIL", "Failed binding to %s: %s", + l->l_url->u_rawurl, nng_strerror(rv)); nni_listener_bump_error(l, rv); nni_atomic_flag_reset(&l->l_started); return (rv); diff --git a/src/core/socket.c b/src/core/socket.c index d9fd5266..98999f6e 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -940,7 +940,7 @@ int nni_sock_add_dialer(nni_sock *s, nni_dialer *d) { nni_sockopt *sopt; - int rv; + int rv; // grab a hold on the dialer for the socket if ((rv = nni_dialer_hold(d)) != 0) { @@ -1522,6 +1522,8 @@ nni_dialer_add_pipe(nni_dialer *d, void *tpipe) nni_stat_inc(&d->st_reject, 1); nni_stat_inc(&s->st_rejects, 1); #endif + nng_log_debug("NNG-PIPEREJECT", + "Pipe closed by pipe callback before added to socket"); nni_pipe_rele(p); return; } -- cgit v1.2.3-70-g09d2