diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-03 14:30:56 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-03 14:30:56 -0400 |
| commit | 5613968d57cb07cc5a66e97c58bd39c22b86a50a (patch) | |
| tree | e45285e007ff55197057e5f7deed1fd45f7e5337 /src/feature/nodelist/networkstatus.c | |
| parent | de76862fd6177acd8c5b801af4df73bfab5d98ac (diff) | |
| download | tor-5613968d57cb07cc5a66e97c58bd39c22b86a50a.tar.gz tor-5613968d57cb07cc5a66e97c58bd39c22b86a50a.zip | |
Improve logging for 28614.
When we fixed 28614, our answer was "if we failed to load the
consensus on windows and it had a CRLF, retry it." But we logged
the failure at "warn", and we only logged the retry at "info".
Now we log the retry at "notice", with more useful information.
Fixes bug 30004.
Diffstat (limited to 'src/feature/nodelist/networkstatus.c')
| -rw-r--r-- | src/feature/nodelist/networkstatus.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 023115978c..a988f700f3 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1761,8 +1761,11 @@ reload_consensus_from_file(const char *fname, flavor, flags, source_dir); #ifdef _WIN32 if (rv < 0 && tor_memstr(map->data, map->size, "\r\n")) { - log_info(LD_GENERAL, "Found CRLF in consensus file %s; falling back to " - "read_file_to_string.", escaped(fname)); + log_notice(LD_GENERAL, "Looks like the above failures are probably " + "because of a CRLF in consensus file %s; falling back to " + "read_file_to_string. Nothing to worry about: this file " + "was probably saved by an earlier version of Tor.", + escaped(fname)); char *content = read_file_to_str(fname, RFTS_IGNORE_MISSING, NULL); rv = networkstatus_set_current_consensus(content, strlen(content), flavor, flags, source_dir); |