From 52509da785467544e05b4dd3da25802c12c2d19d Mon Sep 17 00:00:00 2001 From: Christian Grothoff Date: Fri, 13 Jan 2017 13:25:47 +0100 Subject: [PATCH] degrade warning to DEBUG statement, include logging of retry delay --- src/util/client.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/util/client.c b/src/util/client.c index d06547daf..4fd971040 100644 --- a/src/util/client.c +++ b/src/util/client.c @@ -213,9 +213,6 @@ start_connect (void *cls); static void connect_fail_continuation (struct ClientState *cstate) { - LOG (GNUNET_ERROR_TYPE_WARNING, - "Failed to establish connection to `%s', no further addresses to try.\n", - cstate->service_name); GNUNET_break (NULL == cstate->ap_head); GNUNET_break (NULL == cstate->ap_tail); GNUNET_break (NULL == cstate->dns_active); @@ -225,6 +222,11 @@ connect_fail_continuation (struct ClientState *cstate) // GNUNET_assert (NULL == cstate->proxy_handshake); cstate->back_off = GNUNET_TIME_STD_BACKOFF (cstate->back_off); + LOG (GNUNET_ERROR_TYPE_DEBUG, + "Failed to establish connection to `%s', no further addresses to try, will try again in %s.\n", + cstate->service_name, + GNUNET_STRINGS_relative_time_to_string (cstate->back_off, + GNUNET_YES)); cstate->retry_task = GNUNET_SCHEDULER_add_delayed (cstate->back_off, &start_connect, @@ -271,7 +273,7 @@ transmit_ready (void *cls) cstate->sock, &transmit_ready, cstate); - if (notify_in_flight) + if (notify_in_flight) GNUNET_MQ_impl_send_in_flight (cstate->mq); return; } @@ -583,7 +585,7 @@ try_connect_using_address (void *cls, { struct ClientState *cstate = cls; struct AddressProbe *ap; - + if (NULL == addr) { cstate->dns_active = NULL; @@ -739,7 +741,7 @@ start_connect (void *cls) { connect_success_continuation (cstate); return; - } + } } if ( (NULL == cstate->hostname) || (0 == cstate->port) ) -- 2.25.1