浏览代码

Merge branch 'maint-0.4.0'

George Kadianakis 5 年之前
父节点
当前提交
847fc3280d
共有 2 个文件被更改,包括 13 次插入9 次删除
  1. 4 0
      changes/bug29930
  2. 9 9
      src/feature/nodelist/networkstatus.c

+ 4 - 0
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.
+

+ 9 - 9
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));
     }
   }