Rate-limit "No circuits are opened" message to once-per-hour

mr-4 reports on #7799 that he was seeing it several times per second,
which suggests that things had gone very wrong.

This isn't a real fix, but it should make Tor usable till we can
figure out the real issue.
This commit is contained in:
Nick Mathewson
2012-12-26 10:05:45 -05:00
parent 2e9be92cd7
commit 127cb39ffc
2 changed files with 14 additions and 3 deletions
+8 -3
View File
@@ -478,13 +478,18 @@ circuit_expire_building(void)
}
continue;
} else {
log_notice(LD_CIRC,
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,
"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. ",
"%d guards are live. %s",
channel_state_to_string(victim->n_chan->state),
(long)circ_times.close_ms, num_live_entry_guards(0));
(long)circ_times.close_ms, num_live_entry_guards(0), m);
tor_free(m);
}
}
}