commit bed3b292ad007fa0b059dc998403cac093c64920 Author: teor teor@torproject.org Date: Wed Feb 19 11:15:20 2020 +1000
dirvote: Improve the posted vote log message
Cleanup after 4631. --- src/feature/dirauth/dirvote.c | 8 +++++--- src/test/test_dir_handle_get.c | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 66bb8fe91..90e82a4ee 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -3223,9 +3223,11 @@ dirvote_add_vote(const char *vote_body, time_t time_posted, char tbuf1[ISO_TIME_LEN+1], tbuf2[ISO_TIME_LEN+1]; format_iso_time(tbuf1, time_posted); format_iso_time(tbuf2, voting_schedule.fetch_missing_votes); - log_warn(LD_DIR, "Rejecting vote from %s received at %s; " - "our cutoff for received votes is %s", vi->address, tbuf1, tbuf2); - *msg_out = "Vote received too late, would be dangerous to count it"; + log_warn(LD_DIR, "Rejecting posted vote from %s received at %s; " + "our cutoff for received votes is %s. Check your clock, " + "CPU load, and network load. Also check the authority that " + "posted the vote.", vi->address, tbuf1, tbuf2); + *msg_out = "Posted vote received too late, would be dangerous to count it"; goto err; }
diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c index c0af71147..cf310ebfe 100644 --- a/src/test/test_dir_handle_get.c +++ b/src/test/test_dir_handle_get.c @@ -2750,7 +2750,7 @@ test_dir_handle_get_status_vote_too_late(void* data) tt_assert(!vote); tt_int_op(status_out, OP_EQ, 400); tt_str_op(msg_out, OP_EQ, - "Vote received too late, would be dangerous to count it"); + "Posted vote received too late, would be dangerous to count it");
/* Just after fetch missing */ vote = dirvote_add_vote(VOTE_BODY_V3, @@ -2759,7 +2759,7 @@ test_dir_handle_get_status_vote_too_late(void* data) tt_assert(!vote); tt_int_op(status_out, OP_EQ, 400); tt_str_op(msg_out, OP_EQ, - "Vote received too late, would be dangerous to count it"); + "Posted vote received too late, would be dangerous to count it");
/* On fetch missing */ vote = dirvote_add_vote(VOTE_BODY_V3,