[or-cvs] r15004: Stop reloading the router list from disk for no reason when (in tor/trunk: . src/or)

[arma at seul.org]

Author: arma
Date: 2008-06-07 00:56:08 -0400 (Sat, 07 Jun 2008)
New Revision: 15004

Modified:
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
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.


Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2008-06-07 00:25:46 UTC (rev 15003)
+++ tor/trunk/ChangeLog	2008-06-07 04:56:08 UTC (rev 15004)
@@ -53,6 +53,10 @@
       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

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2008-06-07 00:25:46 UTC (rev 15003)
+++ tor/trunk/src/or/routerlist.c	2008-06-07 04:56:08 UTC (rev 15004)
@@ -859,21 +859,6 @@
   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;
 }