From 0316b3da069744b71bda3fcb3599c59a0c25bc61 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Mon, 18 Mar 2013 16:01:05 +0100 Subject: [PATCH 1/2] Log if saving the unverified consensus failed --- src/or/networkstatus.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index c63c76f..ac6e207 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -1730,7 +1730,11 @@ networkstatus_set_current_consensus(const char *consensus, waiting->set_at = now; waiting->dl_failed = 0; if (!from_cache) { - write_str_to_file(unverified_fname, consensus, 0); + if (write_str_to_file(unverified_fname, consensus, 0)<0) { + log_notice(LD_FS, + "Couldn't write unverified consensus to \"%s\"", + unverified_fname); + } } if (dl_certs) authority_certs_fetch_missing(c, now); -- 1.8.1.5 From 8b2ffa2e37b1e7ea1c4be8ba26ef52d4efb4c7c8 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Wed, 20 Mar 2013 14:41:20 +0100 Subject: [PATCH 2/2] Log socks retries so far --- src/or/connection_edge.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 84d5565..fe9a4eb 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -663,12 +663,13 @@ connection_ap_expire_beginning(void) } log_fn(cutoff < 15 ? LOG_INFO : severity, LD_APP, "We tried for %d seconds to connect to '%s' using exit %s." - " Retrying on a new circuit.", + " Retrying on a new circuit. Retries so far: %d.", seconds_idle, safe_str_client(entry_conn->socks_request->address), conn->cpath_layer ? extend_info_describe(conn->cpath_layer->extend_info): - "*unnamed*"); + "*unnamed*", + entry_conn->num_socks_retries); /* send an end down the circuit */ connection_edge_end(conn, END_STREAM_REASON_TIMEOUT); /* un-mark it as ending, since we're going to reuse it */ -- 1.8.1.5