summaryrefslogtreecommitdiff
path: root/src/or/scheduler.c
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2017-09-14 16:04:47 -0400
committerDavid Goulet <dgoulet@torproject.org>2017-09-15 11:40:59 -0400
commitc910610701475d6fcb13284c318fe5c10fc4bdea (patch)
tree25794af4c5bf9fd8c237945e670b2f55aa49a9c8 /src/or/scheduler.c
parent0d0b677b6427573b87736da00e638911fac7ef7d (diff)
downloadtor-c910610701475d6fcb13284c318fe5c10fc4bdea.tar.gz
tor-c910610701475d6fcb13284c318fe5c10fc4bdea.zip
sched: Improve logging if KIST is disabled
Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src/or/scheduler.c')
-rw-r--r--src/or/scheduler.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/src/or/scheduler.c b/src/or/scheduler.c
index acb6801ab4..3860c62c40 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();