diff options
Diffstat (limited to 'src/or')
| -rw-r--r-- | src/or/circuitbuild.c | 10 | ||||
| -rw-r--r-- | src/or/main.c | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index ad2b2f2bf8..919c371073 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -660,9 +660,13 @@ circuit_send_next_onion_skin(circuit_t *circ) void circuit_note_clock_jumped(int seconds_elapsed) { - log(LOG_WARN, LD_GENERAL, - "Please report: your clock just jumped %d seconds forward; " - "assuming established circuits no longer work.", seconds_elapsed); + if (server_mode(get_options())) + log(LOG_WARN, LD_GENERAL, + "Please report: your clock just jumped %d seconds forward; " + "assuming established circuits no longer work.", seconds_elapsed); + else + log(LOG_NOTICE, LD_GENERAL, "Your clock just jumped %d seconds forward; " + "assuming established circuits no longer work.", seconds_elapsed); has_completed_circuit=0; /* so it'll log when it works again */ circuit_mark_all_unused_circs(); circuit_expire_all_dirty_circs(); diff --git a/src/or/main.c b/src/or/main.c index 03173ca044..d331c961cc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -985,9 +985,11 @@ second_elapsed_callback(int fd, short event, void *args) me->address, me->dir_port); } - /* if more than 100s have elapsed, probably the clock jumped: doesn't - * count. */ - if (seconds_elapsed < 100) +/** If more than this many seconds have elapsed, probably the clock + * jumped: doesn't count. */ +#define NUM_JUMPED_SECONDS_BEFORE_WARN 10 +/* This used to be 100, but I cranked it down for Mike Chiussi -RD */ + if (seconds_elapsed < NUM_JUMPED_SECONDS_BEFORE_WARN) stats_n_seconds_working += seconds_elapsed; else circuit_note_clock_jumped(seconds_elapsed); |