tor

commit 92e8bdf296c042ad386b2acb764bb4f4cfd2de0f
parent 61e6b217c5c83bc49e888f594f931c00c3e9b971
Author: teor <teor@torproject.org>
Date:   Tue,  9 Apr 2019 11:35:41 +1000

Merge remote-tracking branch 'tor-github/pr/892' into maint-0.4.0

Diffstat:
A
changes/bug28614_better_logging
 | 
6
++++++
M
src/feature/nodelist/networkstatus.c
 | 
7
+++++--

2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/changes/bug28614_better_logging b/changes/bug28614_better_logging
@@ -0,0 +1,6 @@
+  o Minor bugfixes (logging):
+    - On Windows, when errors cause us to reload a consensus from disk, tell
+      the user that we are retrying at log level "notice". Previously we only
+      logged this information at "info", which was confusing because the
+      errors themselves were logged at "warning". Improves previous fix for
+      28614.  Fixes bug 30004; bugfix on 0.4.0.2-alpha.
diff --git 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);