diff options
author | Roger Dingledine <arma@torproject.org> | 2016-02-22 02:54:32 -0500 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2016-02-22 02:54:32 -0500 |
commit | 43193ec888cbc15689b6db784d59c45c34a1e7f1 (patch) | |
tree | 4cac5a6a7c2710fb8f3cdb864e92baa06dcb3eb0 /src/or/main.c | |
parent | c6952f65ef535b3b59dd07b947315e1ac1116c8e (diff) | |
download | tor-43193ec888cbc15689b6db784d59c45c34a1e7f1.tar.gz tor-43193ec888cbc15689b6db784d59c45c34a1e7f1.zip |
refactor directory_info_has_arrived so we can quiet the logs
no actual behavior changes
Diffstat (limited to 'src/or/main.c')
-rw-r--r-- | src/or/main.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c index 408f2447c1..96a56fcb90 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1002,12 +1002,12 @@ directory_all_unreachable(time_t now) /** This function is called whenever we successfully pull down some new * network statuses or server descriptors. */ void -directory_info_has_arrived(time_t now, int from_cache) +directory_info_has_arrived(time_t now, int from_cache, int suppress_logs) { const or_options_t *options = get_options(); if (!router_have_minimum_dir_info()) { - int quiet = from_cache || + int quiet = suppress_logs || from_cache || directory_too_idle_to_fetch_descriptors(options, now); tor_log(quiet ? LOG_INFO : LOG_NOTICE, LD_DIR, "I learned some more directory information, but not enough to " @@ -2391,7 +2391,7 @@ do_main_loop(void) * appropriate.) */ now = time(NULL); - directory_info_has_arrived(now, 1); + directory_info_has_arrived(now, 1, 0); if (server_mode(get_options())) { /* launch cpuworkers. Need to do this *after* we've read the onion key. */ |