Merge branch 'maint-0.3.5' into maint-0.4.2

tevador · Jul 2, 2020 · 07d8d39 · 07d8d39
2 parents dbb70d8 + 39830b6
commit 07d8d39
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/changes/bug16016 b/changes/bug16016
@@ -0,0 +1,4 @@
+  o Minor bugfixes (logging):
+    - Downgrade a noisy log message that could occur naturally when
+      receiving an extrainfo document that we no longer want.
+      Fixes bug 16016; bugfix on 0.2.6.3-alpha.
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c
@@ -1087,7 +1087,11 @@ extrainfo_insert,(routerlist_t *rl, extrainfo_t *ei, int warn_if_incompatible))
      * This just won't work. */;
     static ratelim_t no_sd_ratelim = RATELIM_INIT(1800);
     r = ROUTER_BAD_EI;
-    log_fn_ratelim(&no_sd_ratelim, severity, LD_BUG,
+    /* This is a DEBUG because it can happen naturally, if we tried
+     * to add an extrainfo for which we no longer have the
+     * corresponding routerinfo.
+     */
+    log_fn_ratelim(&no_sd_ratelim, LOG_DEBUG, LD_DIR,
                    "No entry found in extrainfo map.");
     goto done;
   }