[tor-commits] [tor/master] Log info about intro point limits when they are reached and reset

[nickm at torproject.org]

commit c34411d9cb1c264ad5ccc149ea07f1fdc826010a
Author: teor <teor2345 at gmail.com>
Date:   Sat Mar 4 22:46:19 2017 +1100

    Log info about intro point limits when they are reached and reset
    
    Depends on 21594, part of 21622.
---
 src/or/rendservice.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 2b7c6bf..82e3137 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -4136,8 +4136,12 @@ rend_consider_services_intro_points(void)
 
     /* This retry period is important here so we don't stress circuit
      * creation. */
+
     if (now > service->intro_period_started + INTRO_CIRC_RETRY_PERIOD) {
-      /* One period has elapsed; we can try building circuits again. */
+      /* One period has elapsed:
+       *  - if we stopped, we can try building circuits again,
+       *  - if we haven't, we reset the circuit creation counts. */
+      rend_log_intro_limit(service, LOG_INFO);
       service->intro_period_started = now;
       service->n_intro_circuits_launched = 0;
     } else if (service->n_intro_circuits_launched >=
@@ -4145,6 +4149,7 @@ rend_consider_services_intro_points(void)
                                       service->n_intro_points_wanted)) {
       /* We have failed too many times in this period; wait for the next
        * one before we try to initiate any more connections. */
+      rend_log_intro_limit(service, LOG_WARN);
       continue;
     }