From ebab48769d31fcd168db3c840bc1bbd6561464e2 Mon Sep 17 00:00:00 2001 From: Roger Dingledine Date: Sat, 7 Jun 2008 04:56:08 +0000 Subject: 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. svn:r15004 --- src/or/routerlist.c | 15 --------------- 1 file changed, 15 deletions(-) (limited to 'src/or') diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 925111438e..ca3cb6c0db 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 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; } -- cgit v1.2.3-54-g00ecf