diff options
| author | George Kadianakis <desnacked@riseup.net> | 2019-04-30 19:26:30 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2019-04-30 19:26:30 +0300 |
| commit | 603074ea18e5435e1cfe1b0171792728974bc4b0 (patch) | |
| tree | 39b7759ebf003b6c455710aec8330a5d518489cb | |
| parent | a5b323acbb0b12b1e6db9cdc3e8d69a1c8af0ccc (diff) | |
| parent | e1d4e2badbd6cdb8c3939c6a1e6ebdcfeca68b49 (diff) | |
| download | tor-603074ea18e5435e1cfe1b0171792728974bc4b0.tar.gz tor-603074ea18e5435e1cfe1b0171792728974bc4b0.zip | |
Merge branch 'maint-0.4.0' 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)); } } |