瀏覽代碼

don't update dir_info_status when we have minimum dir info

Nothing ever uses the string when we're in "have minimum dir info"
state. The flow of the function is "check for problems, if you see a
problem write an explanation to dir_info_status and set res to 0". If
you get to the end of the function without any problems, then res =
1 and we're all ready to start making circuits.

(Changed after consultation with Yawning.)
Roger Dingledine 9 年之前
父節點
當前提交
70f46f7ae6
共有 1 個文件被更改,包括 0 次插入16 次删除
  1. 0 16
      src/or/nodelist.c

+ 0 - 16
src/or/nodelist.c

@@ -1703,22 +1703,6 @@ update_router_have_minimum_dir_info(void)
       res = 0;
       control_event_bootstrap(BOOTSTRAP_STATUS_REQUESTING_DESCRIPTORS, 0);
       goto done;
-    } else {
-      /* these messages can be excessive in testing networks */
-      static ratelim_t last_warned =
-      RATELIM_INIT(NOTICE_DIR_INFO_STATUS_INTERVAL);
-      char *suppression_msg = NULL;
-
-      tor_snprintf(dir_info_status, sizeof(dir_info_status),
-                   "We have enough %sdescriptors: we have %d/%d, and "
-                   "can build %d%% of likely paths. (We have %s.)",
-                   using_md?"micro":"", num_present, num_usable,
-                   (int)(paths*100), status);
-
-      if ((suppression_msg = rate_limit_log(&last_warned, time(NULL)))) {
-        log_info(LD_NET, "%s%s", dir_info_status, suppression_msg);
-        tor_free(suppression_msg);
-      }
     }
 
     tor_free(status);