sarah
/
tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
This commit is contained in:
Roger Dingledine 2008-06-07 04:56:08 +00:00
parent d27f7e8e46
commit ebab48769d
2 changed files with 4 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -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

15
src/or/routerlist.c
View File

@ -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;
}