diff options
| author | Mike Perry <mikeperry-git@fscked.org> | 2013-03-27 15:34:54 -0700 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2013-03-29 12:17:04 -0400 |
| commit | 66586da9bc023bf60b2d18e02004a4e278b73359 (patch) | |
| tree | 00a031565b2954070f7f64b360302f481a35252c | |
| parent | cc641ff5b05b2f8bc831ff28fa5d4226933d18a0 (diff) | |
| download | tor-66586da9bc023bf60b2d18e02004a4e278b73359.tar tor-66586da9bc023bf60b2d18e02004a4e278b73359.tar.gz | |
Add detail to log messages related to bug 7799.
Note this does not solve bug 7799, it is only to help us diagnose it.
| -rw-r--r-- | src/or/circuituse.c | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 14576f13d..bbf219a1e 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -536,8 +536,13 @@ circuit_expire_building(void) int first_hop_succeeded = TO_ORIGIN_CIRCUIT(victim)->cpath->state == CPATH_STATE_OPEN; log_info(LD_CIRC, - "No circuits are opened. Relaxing timeout for " - "a circuit with channel state %s. %d guards are live.", + "No circuits are opened. Relaxing timeout for circuit %d " + "(a %s %d-hop circuit in state %s with channel state %s). " + "%d guards are live.", + TO_ORIGIN_CIRCUIT(victim)->global_identifier, + circuit_purpose_to_string(victim->purpose), + TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len, + circuit_state_to_string(victim->state), channel_state_to_string(victim->n_chan->state), num_live_entry_guards(0)); @@ -552,10 +557,14 @@ circuit_expire_building(void) } else { static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); log_fn_ratelim(&relax_timeout_limit, LOG_NOTICE, LD_CIRC, - "No circuits are opened. Relaxed timeout for " - "a circuit with channel state %s to %ldms. " - "However, it appears the circuit has timed out anyway. " - "%d guards are live.", + "No circuits are opened. Relaxed timeout for circuit %d " + "(a %s %d-hop circuit in state %s with channel state %s) to " + "%ldms. However, it appears the circuit has timed out " + "anyway. %d guards are live.", + TO_ORIGIN_CIRCUIT(victim)->global_identifier, + circuit_purpose_to_string(victim->purpose), + TO_ORIGIN_CIRCUIT(victim)->build_state->desired_path_len, + circuit_state_to_string(victim->state), channel_state_to_string(victim->n_chan->state), (long)circ_times.close_ms, num_live_entry_guards(0)); } |