diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-12-26 11:07:15 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-12-26 11:07:15 -0500 |
| commit | a7334f5122046b55a5eff425cdaaa3e56c5defed (patch) | |
| tree | 22fc6bbfb9eafbff43f285963b4edf81ec969603 /src/or/circuituse.c | |
| parent | f269e0f9a51ecc7f22e62bde302afd8574d2f96f (diff) | |
| download | tor-a7334f5122046b55a5eff425cdaaa3e56c5defed.tar.gz tor-a7334f5122046b55a5eff425cdaaa3e56c5defed.zip | |
Use log_fn_ratelim in a few places.
Diffstat (limited to 'src/or/circuituse.c')
| -rw-r--r-- | src/or/circuituse.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index c3495b4402..2ffffa8423 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -479,17 +479,13 @@ circuit_expire_building(void) continue; } else { static ratelim_t relax_timeout_limit = RATELIM_INIT(3600); - char *m; - if ((m = rate_limit_log(&relax_timeout_limit, approx_time()))) { - log_notice(LD_CIRC, + 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. %s", + "%d guards are live.", channel_state_to_string(victim->n_chan->state), - (long)circ_times.close_ms, num_live_entry_guards(0), m); - tor_free(m); - } + (long)circ_times.close_ms, num_live_entry_guards(0)); } } |