diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-04-30 15:52:39 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-04-30 15:52:39 -0400 |
| commit | 672c72d7d725b92e03a5d7dae01cf88b5407648f (patch) | |
| tree | 24d070e33373ee36d8d3c7358a7e97ffd7c03229 | |
| parent | 955d73d1e9ca109468fdd8c8e8c07dd86a72f9bc (diff) | |
| parent | 603074ea18e5435e1cfe1b0171792728974bc4b0 (diff) | |
| download | tor-672c72d7d725b92e03a5d7dae01cf88b5407648f.tar.gz tor-672c72d7d725b92e03a5d7dae01cf88b5407648f.zip | |
Merge branch 'release-0.4.0' of git-rw.torproject.org:/tor into release-0.4.0
| -rw-r--r-- | changes/bug29930 | 4 | ||||
| -rw-r--r-- | src/feature/nodelist/networkstatus.c | 18 |
2 files changed, 13 insertions, 9 deletions
diff --git a/changes/bug29930 b/changes/bug29930 new file mode 100644 index 0000000000..a99b11430b --- /dev/null +++ b/changes/bug29930 @@ -0,0 +1,4 @@ + o Minor bugfixes (UI): + - Lower log level of unlink() errors during bootstrap. Fixes bug 29930; + bugfix on 0.4.0.1-alpha. + diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index a988f700f3..24e3b212f0 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -2033,9 +2033,9 @@ networkstatus_set_current_consensus(const char *consensus, * latest consensus. */ if (was_waiting_for_certs && from_cache) if (unlink(unverified_fname) != 0) { - log_warn(LD_FS, - "Failed to unlink %s: %s", - unverified_fname, strerror(errno)); + log_debug(LD_FS, + "Failed to unlink %s: %s", + unverified_fname, strerror(errno)); } } goto done; @@ -2048,9 +2048,9 @@ networkstatus_set_current_consensus(const char *consensus, } if (was_waiting_for_certs && (r < -1) && from_cache) { if (unlink(unverified_fname) != 0) { - log_warn(LD_FS, - "Failed to unlink %s: %s", - unverified_fname, strerror(errno)); + log_debug(LD_FS, + "Failed to unlink %s: %s", + unverified_fname, strerror(errno)); } } goto done; @@ -2115,9 +2115,9 @@ networkstatus_set_current_consensus(const char *consensus, waiting->set_at = 0; waiting->dl_failed = 0; if (unlink(unverified_fname) != 0) { - log_warn(LD_FS, - "Failed to unlink %s: %s", - unverified_fname, strerror(errno)); + log_debug(LD_FS, + "Failed to unlink %s: %s", + unverified_fname, strerror(errno)); } } |