torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Downgrade 'Got a certificate, but we already have it' log message from warning to info, except when we're a dirauth (fixes bug 5238)

Browse Source
This commit is contained in:
Andrea Shepard
2012-06-28 00:21:06 -07:00
committed by Nick Mathewson
parent 23f2e37ff7
commit bdc8270280
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug5238
+3
View File
@@ -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.
src/or/routerlist.c
+12 -3
View File
@@ -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);
}