[tor-commits] [tor/master] sched: Improve logging if KIST is disabled

[nickm at torproject.org]

commit c910610701475d6fcb13284c318fe5c10fc4bdea
Author: David Goulet <dgoulet at torproject.org>
Date:   Thu Sep 14 16:04:47 2017 -0400

    sched: Improve logging if KIST is disabled
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/scheduler.c | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/or/scheduler.c b/src/or/scheduler.c
index acb6801ab..3860c62c4 100644
--- a/src/or/scheduler.c
+++ b/src/or/scheduler.c
@@ -293,10 +293,17 @@ select_scheduler(void)
       goto end;
     case SCHEDULER_KIST:
       if (!scheduler_can_use_kist()) {
-        log_warn(LD_SCHED, "Scheduler KIST can't be used. Consider removing "
-                           "it from Schedulers or if you have a tor built "
-                           "with KIST support, you should make sure "
-                           "KISTSchedRunInterval is a non zero value");
+#ifdef HAVE_KIST_SUPPORT
+        if (get_options()->KISTSchedRunInterval == -1) {
+          log_info(LD_SCHED, "Scheduler type KIST can not be used. It is "
+                             "disabled because KISTSchedRunInterval=-1");
+        } else {
+          log_notice(LD_SCHED, "Scheduler type KIST has been disabled by "
+                               "the consensus.");
+        }
+#else /* HAVE_KIST_SUPPORT */
+        log_info(LD_SCHED, "Scheduler type KIST not built in");
+#endif /* HAVE_KIST_SUPPORT */
         continue;
       }
       the_scheduler = get_kist_scheduler();