diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/or/routerlist.c | 15 |
2 files changed, 4 insertions, 15 deletions
@@ -53,6 +53,10 @@ Changes in version 0.2.1.1-alpha - 2008-??-?? the second part of bug 681. - Make bridge authorities correctly clean extrainfo store from time to time. Bugfix on 0.2.0.x. + - Stop reloading the router list from disk for no reason when we + run out of reachable directory mirrors. Once upon a time reloading + it would set the 'is_running' flag back to 1 for them. It hasn't + done that for a long time. o Minor features: - Allow separate log levels to be configured for different logging diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 925111438..ca3cb6c0d 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -859,21 +859,6 @@ router_pick_directory_server(authority_type_t type, int flags) mark_all_trusteddirservers_up(); /* try again */ choice = router_pick_directory_server_impl(type, flags); - if (choice) - return choice; - - /* XXXX021 arma: what's the point of *reloading* and trying again?? -NM */ - /* XXXX021 <arma> once upon a time, reloading set the is_running back - to 1. i think. i bet it has no purpose now. */ - /* XXXX021 Let's stop reloading in 0.2.1.x, then, and see if anything - * breaks -NM */ - log_info(LD_DIR,"Still no %s router entries. Reloading and trying again.", - (flags & PDS_IGNORE_FASCISTFIREWALL) ? "known" : "reachable"); - if (router_reload_router_list()) { - return NULL; - } - /* give it one last try */ - choice = router_pick_directory_server_impl(type, flags); return choice; } |