diff options
author | Christian Grothoff <christian@grothoff.org> | 2017-01-13 13:25:47 +0100 |
---|---|---|
committer | Christian Grothoff <christian@grothoff.org> | 2017-01-13 13:25:47 +0100 |
commit | 52509da785467544e05b4dd3da25802c12c2d19d (patch) | |
tree | d165e93c78f1ec75410a4a2075330ddca256f97f /src/util/client.c | |
parent | 553da9baaee28de37ac70af6e59549cabdd18373 (diff) | |
download | gnunet-52509da785467544e05b4dd3da25802c12c2d19d.tar.gz gnunet-52509da785467544e05b4dd3da25802c12c2d19d.zip |
degrade warning to DEBUG statement, include logging of retry delay
Diffstat (limited to 'src/util/client.c')
-rw-r--r-- | src/util/client.c | 14 |
1 files 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); | |||
213 | static void | 213 | static void |
214 | connect_fail_continuation (struct ClientState *cstate) | 214 | connect_fail_continuation (struct ClientState *cstate) |
215 | { | 215 | { |
216 | LOG (GNUNET_ERROR_TYPE_WARNING, | ||
217 | "Failed to establish connection to `%s', no further addresses to try.\n", | ||
218 | cstate->service_name); | ||
219 | GNUNET_break (NULL == cstate->ap_head); | 216 | GNUNET_break (NULL == cstate->ap_head); |
220 | GNUNET_break (NULL == cstate->ap_tail); | 217 | GNUNET_break (NULL == cstate->ap_tail); |
221 | GNUNET_break (NULL == cstate->dns_active); | 218 | GNUNET_break (NULL == cstate->dns_active); |
@@ -225,6 +222,11 @@ connect_fail_continuation (struct ClientState *cstate) | |||
225 | // GNUNET_assert (NULL == cstate->proxy_handshake); | 222 | // GNUNET_assert (NULL == cstate->proxy_handshake); |
226 | 223 | ||
227 | cstate->back_off = GNUNET_TIME_STD_BACKOFF (cstate->back_off); | 224 | cstate->back_off = GNUNET_TIME_STD_BACKOFF (cstate->back_off); |
225 | LOG (GNUNET_ERROR_TYPE_DEBUG, | ||
226 | "Failed to establish connection to `%s', no further addresses to try, will try again in %s.\n", | ||
227 | cstate->service_name, | ||
228 | GNUNET_STRINGS_relative_time_to_string (cstate->back_off, | ||
229 | GNUNET_YES)); | ||
228 | cstate->retry_task | 230 | cstate->retry_task |
229 | = GNUNET_SCHEDULER_add_delayed (cstate->back_off, | 231 | = GNUNET_SCHEDULER_add_delayed (cstate->back_off, |
230 | &start_connect, | 232 | &start_connect, |
@@ -271,7 +273,7 @@ transmit_ready (void *cls) | |||
271 | cstate->sock, | 273 | cstate->sock, |
272 | &transmit_ready, | 274 | &transmit_ready, |
273 | cstate); | 275 | cstate); |
274 | if (notify_in_flight) | 276 | if (notify_in_flight) |
275 | GNUNET_MQ_impl_send_in_flight (cstate->mq); | 277 | GNUNET_MQ_impl_send_in_flight (cstate->mq); |
276 | return; | 278 | return; |
277 | } | 279 | } |
@@ -583,7 +585,7 @@ try_connect_using_address (void *cls, | |||
583 | { | 585 | { |
584 | struct ClientState *cstate = cls; | 586 | struct ClientState *cstate = cls; |
585 | struct AddressProbe *ap; | 587 | struct AddressProbe *ap; |
586 | 588 | ||
587 | if (NULL == addr) | 589 | if (NULL == addr) |
588 | { | 590 | { |
589 | cstate->dns_active = NULL; | 591 | cstate->dns_active = NULL; |
@@ -739,7 +741,7 @@ start_connect (void *cls) | |||
739 | { | 741 | { |
740 | connect_success_continuation (cstate); | 742 | connect_success_continuation (cstate); |
741 | return; | 743 | return; |
742 | } | 744 | } |
743 | } | 745 | } |
744 | if ( (NULL == cstate->hostname) || | 746 | if ( (NULL == cstate->hostname) || |
745 | (0 == cstate->port) ) | 747 | (0 == cstate->port) ) |