aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2010-09-16 01:13:51 +0200
committerSebastian Hahn <sebastian@torproject.org>2010-09-16 01:13:51 +0200
commit4f1e36ca1d2c8051f6d282fadef3834b4b76462f (patch)
tree50756a042aea581e2c56cdaaab157ad7df8c9cda
parent277295efc1689d6ce039fb474147ddf155fbf516 (diff)
downloadtor-4f1e36ca1d2c8051f6d282fadef3834b4b76462f.tar.gz
tor-4f1e36ca1d2c8051f6d282fadef3834b4b76462f.zip
Demote a warn when enabling CellStatistics
When the CellStatistics option is off, we don't store cell insertion times. Doing so would also not be very smart, because there seem to still be some performance issues with this type of statistics. Nothing harmful happens when we don't have insertion times, so we don't need to alarm the user.
-rw-r--r--changes/bug19214
-rw-r--r--src/or/relay.c4
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug1921 b/changes/bug1921
new file mode 100644
index 0000000000..748d50b13d
--- /dev/null
+++ b/changes/bug1921
@@ -0,0 +1,4 @@
+ o Minor bugfixes:
+ - Demote a warn to info that happens when the CellStatistics option
+ was just enabled. Fixes bug 1921; bugfix on 0.2.2.1-alpha. Reported
+ by Moritz Bartl.
diff --git a/src/or/relay.c b/src/or/relay.c
index a4f7718d90..f6f5d92fcb 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -2297,7 +2297,9 @@ connection_or_flush_from_first_active_circuit(or_connection_t *conn, int max,
flushed = (uint32_t)((now.tv_sec % SECONDS_IN_A_DAY) * 100L +
(uint32_t)now.tv_usec / (uint32_t)10000L);
if (!it_queue || !it_queue->first) {
- log_warn(LD_BUG, "Cannot determine insertion time of cell.");
+ log_info(LD_GENERAL, "Cannot determine insertion time of cell. "
+ "Looks like the CellStatistics option was "
+ "recently enabled.");
} else {
or_circuit_t *orcirc = TO_OR_CIRCUIT(circ);
insertion_time_elem_t *elem = it_queue->first;