diff options
| author | Roger Dingledine <arma@torproject.org> | 2008-04-24 05:32:55 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2008-04-24 05:32:55 +0000 |
| commit | d5be9009864c919efa02a07d0235ef607d7f3f75 (patch) | |
| tree | 5a9dc1307a09a7bc8d2d7986e52a3141518079b8 | |
| parent | c04771505e43cbcd8c11c782da2c678d2c3ae327 (diff) | |
| download | tor-d5be9009864c919efa02a07d0235ef607d7f3f75.tar tor-d5be9009864c919efa02a07d0235ef607d7f3f75.tar.gz | |
forward-port the severity fixes
svn:r14442
| -rw-r--r-- | src/or/directory.c | 3 | ||||
| -rw-r--r-- | src/or/networkstatus.c | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index aee76a5b7..f994a448d 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -1534,7 +1534,8 @@ connection_dir_client_reached_eof(dir_connection_t *conn) if ((r=networkstatus_set_current_consensus(body, 0))<0) { log_fn(r<-1?LOG_WARN:LOG_INFO, LD_DIR, "Unable to load consensus directory downloaded from " - "server '%s:%d'", conn->_base.address, conn->_base.port); + "server '%s:%d'. I'll try again soon.", + conn->_base.address, conn->_base.port); tor_free(body); tor_free(headers); tor_free(reason); networkstatus_consensus_download_failed(0); return -1; diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 3029866f2..5ec72daf4 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -452,10 +452,10 @@ networkstatus_check_consensus_signature(networkstatus_t *consensus, }); SMARTLIST_FOREACH(missing_authorities, trusted_dir_server_t *, ds, { - log(severity, LD_DIR, "Consensus does not include configured " - "authority '%s' at %s:%d (identity %s)", - ds->nickname, ds->address, (int)ds->dir_port, - hex_str(ds->v3_identity_digest, DIGEST_LEN)); + log_info(LD_DIR, "Consensus does not include configured " + "authority '%s' at %s:%d (identity %s)", + ds->nickname, ds->address, (int)ds->dir_port, + hex_str(ds->v3_identity_digest, DIGEST_LEN)); }); log(severity, LD_DIR, "%d unknown, %d missing key, %d good, %d bad, %d no signature, " @@ -1391,10 +1391,8 @@ networkstatus_set_current_consensus(const char *consensus, unsigned flags) if (r == -1) { /* Okay, so it _might_ be signed enough if we get more certificates. */ if (!was_waiting_for_certs) { - /* XXX020 eventually downgrade this log severity, or make it so - * users know why they're being told. */ - log_notice(LD_DIR, "Not enough certificates to check networkstatus " - "consensus"); + log_info(LD_DIR, + "Not enough certificates to check networkstatus consensus"); } if (!current_consensus || c->valid_after > current_consensus->valid_after) { |