diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-09-25 11:12:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-09-25 11:12:56 -0400 |
| commit | 90e8d1f58fb77eb15c59c1bd846aabe1555b64f2 (patch) | |
| tree | bd4ab5dabd619723e50eea4ef9cb871bf2955f79 /src/or/scheduler.c | |
| parent | f82f1f4b8cc98d7fea2bcc0fb5bf7973cd3f164e (diff) | |
| parent | 581e2c8b2c2976d3272d35957c1085514d446b44 (diff) | |
| download | tor-90e8d1f58fb77eb15c59c1bd846aabe1555b64f2.tar.gz tor-90e8d1f58fb77eb15c59c1bd846aabe1555b64f2.zip | |
Merge branch 'bug23539_032_01_squashed'
Diffstat (limited to 'src/or/scheduler.c')
| -rw-r--r-- | src/or/scheduler.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/or/scheduler.c b/src/or/scheduler.c index 720bc80b48..22a9b574ac 100644 --- a/src/or/scheduler.c +++ b/src/or/scheduler.c @@ -249,13 +249,8 @@ select_scheduler(void) case SCHEDULER_KIST: if (!scheduler_can_use_kist()) { #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."); - } + log_notice(LD_SCHED, "Scheduler type KIST has been disabled by " + "the consensus or no kernel support."); #else /* !(defined(HAVE_KIST_SUPPORT)) */ log_info(LD_SCHED, "Scheduler type KIST not built in"); #endif /* defined(HAVE_KIST_SUPPORT) */ |