[tor-commits] [tor/master] Downgrade 'Got a certificate, but we already have it' log message from warning to info, except when we're a dirauth (fixes bug 5238)

[nickm@xxxxxxxxxxxxxx]

commit bdc8270280b345f0e02a6615f8670f3c47d99a22
Author: Andrea Shepard <andrea@xxxxxxxxxxxxxxxxxxx>
Date:   Thu Jun 28 00:21:06 2012 -0700

    Downgrade 'Got a certificate, but we already have it' log message from warning to info, except when we're a dirauth (fixes bug 5238)
---
 changes/bug5238     |    3 +++
 src/or/routerlist.c |   15 ++++++++++++---
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/changes/bug5238 b/changes/bug5238
new file mode 100644
index 0000000..2f18707
--- /dev/null
+++ b/changes/bug5238
@@ -0,0 +1,3 @@
+ o Minor bugfixes:
+   - Downgrade "Got a certificate, but we already have it" log mesages from
+     warning to info, except when we're a dirauth.
diff --git a/src/or/routerlist.c b/src/or/routerlist.c
index 490c123..8349b7a 100644
--- a/src/or/routerlist.c
+++ b/src/or/routerlist.c
@@ -217,9 +217,18 @@ trusted_dirs_load_certs_from_string(const char *contents, int from_store,
        * probably means we wanted a different secret key or we are trying to
        * replace an expired cert that has not in fact been updated. */
       if (!from_store) {
-        log_warn(LD_DIR, "Got a certificate for %s, but we already have it. "
-                 "Maybe they haven't updated it. Waiting for a while.",
-                 ds ? ds->nickname : "an old or new authority");
+        if (authdir_mode(get_options())) {
+          log_warn(LD_DIR,
+                   "Got a certificate for %s, but we already have it. "
+                   "Maybe they haven't updated it. Waiting for a while.",
+                   ds ? ds->nickname : "an old or new authority");
+        } else {
+          log_info(LD_DIR,
+                   "Got a certificate for %s, but we already have it. "
+                   "Maybe they haven't updated it. Waiting for a while.",
+                   ds ? ds->nickname : "an old or new authority");
+        }
+
         authority_cert_dl_failed(cert->cache_info.identity_digest, 404);
       }
 



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits