Improve error message when all permitted Exits are down

The old "No specified non-excluded exit routers seem to be running"
message was somewhat confusing.

Fix for 7890.
This commit is contained in:
Nick Mathewson 2017-05-30 10:59:04 -04:00
parent 671c5dcde3
commit 9d59769db7
2 changed files with 7 additions and 2 deletions

4
changes/bug7890 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes (logging):
- Use a more comprehensible log message when telling the user they've
excluded every running exit node. Fixes bug 7890; bugfix on
0.2.2.25-alpha.

View File

@ -1956,9 +1956,10 @@ choose_good_exit_server_general(int need_uptime, int need_capacity)
} }
if (options->ExitNodes) { if (options->ExitNodes) {
log_warn(LD_CIRC, log_warn(LD_CIRC,
"No specified %sexit routers seem to be running: " "No exits in ExitNodes%s seem to be running: "
"can't choose an exit.", "can't choose an exit.",
options->ExcludeExitNodesUnion_ ? "non-excluded " : ""); options->ExcludeExitNodesUnion_ ?
", except possibly those excluded by your configuration, " : "");
} }
return NULL; return NULL;
} }