From: Ian Jackson Date: Thu, 7 Jul 2022 14:21:08 +0000 (+0100) Subject: Fix stats logging and log missing better. X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ian/git?a=commitdiff_plain;h=aa3992fb5ffe43760a4d469e62aef5f1f2f4f3ed;p=innduct.git Fix stats logging and log missing better. --- diff --git a/debian/changelog b/debian/changelog index 13c9abf..1128763 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,6 @@ -innduct (2.1~~iwj1) unstable; urgency=medium +innduct (2.1~~iwj2) unstable; urgency=medium + * Fix stats logging and log missing better. * Fix many bugs and compiler warnings. -- Ian Jackson Thu, 07 Jul 2022 11:24:20 +0100 diff --git a/statemc.c b/statemc.c index deeee36..2e49692 100644 --- a/statemc.c +++ b/statemc.c @@ -238,8 +238,9 @@ static void notice_processed_counts(Counts *counts, int completed, ? masprintf(" autodeferred=%ld", ipf_xtra->autodefer) : masprintf("%s",""); - notice("%s %s read=%d (+bl=%d,+err=%d)%s%s" - " missing=%d offered=%d (ch=%d,nc=%d) accepted=%d (ch=%d,nc=%d)" + notice("%s %s read=%d (+bl=%d,+err=%d)%s%s missing=%d" + " offered=%d (ch=%d,nc=%d;mi=%d)" + " accepted=%d (ch=%d,nc=%d;mi=%d)" RESULT_COUNTS(RCI_NOTHING, RCI_TRIPLE_FMT) , completed?"completed":"processed", what, @@ -247,9 +248,9 @@ static void notice_processed_counts(Counts *counts, int completed, counts->events[read_err], inprog, autodefer, counts->events[nooffer_missing], CNT(Unchecked,sent) + CNT(Unsolicited,sent) - , CNT(Unchecked,sent), CNT(Unsolicited,sent), - CNT(Wanted,accepted) + CNT(Unsolicited,accepted) - , CNT(Wanted,accepted), CNT(Unsolicited,accepted) + , CNT(Unchecked,sent), CNT(Unsolicited,sent), CNT(Unsolicited,missing), + CNT(Wanted,accepted) + CNT(Wanted,accepted) + , CNT(Wanted,accepted), CNT(Wanted,accepted), CNT(Wanted,missing) RESULT_COUNTS(RCI_NOTHING, RCI_TRIPLE_VALS) );