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 | 847fc3280d4a77859c28f4c6c91c2cdf863c5c43 (patch) | |
| tree | e399ea6d4d8e385a4545ac34b6c65a4bec5218c2 | |
| parent | f2800b53ad08abb867a3e31590f03f92f9f17807 (diff) | |
| parent | e1d4e2badbd6cdb8c3939c6a1e6ebdcfeca68b49 (diff) | |
| download | tor-847fc3280d4a77859c28f4c6c91c2cdf863c5c43.tar.gz tor-847fc3280d4a77859c28f4c6c91c2cdf863c5c43.zip | |
Merge branch 'maint-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 fdadfc3039..22fef81085 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -2034,9 +2034,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; @@ -2049,9 +2049,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; @@ -2116,9 +2116,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)); } } |