|
@@ -553,13 +553,6 @@ static int do_main_loop(void) {
|
|
|
int timeout;
|
|
|
int poll_result;
|
|
|
|
|
|
- /* load the routers file */
|
|
|
- if(options.RouterFile &&
|
|
|
- router_set_routerlist_from_file(options.RouterFile) < 0) {
|
|
|
- log_fn(LOG_ERR,"Error loading router list.");
|
|
|
- return -1;
|
|
|
- }
|
|
|
-
|
|
|
/* Initialize the history structures. */
|
|
|
rep_hist_init();
|
|
|
/* Intialize the service cache. */
|
|
@@ -572,6 +565,13 @@ static int do_main_loop(void) {
|
|
|
return -1;
|
|
|
}
|
|
|
|
|
|
+ /* load the routers file */
|
|
|
+ if(options.RouterFile &&
|
|
|
+ router_set_routerlist_from_file(options.RouterFile) < 0) {
|
|
|
+ log_fn(LOG_ERR,"Error loading router list.");
|
|
|
+ return -1;
|
|
|
+ }
|
|
|
+
|
|
|
if(options.DirPort) { /* the directory is already here, run startup things */
|
|
|
has_fetched_directory = 1;
|
|
|
directory_has_arrived();
|