Fix stats logging and log missing better.

diff --git a/debian/changelog b/debian/changelog
index 13c9abfe5affcb2bc6b7c9b9a2c8deedc22bc143..1128763fda1106c3d52c74f79e17d99380b206b6 100644 (file)
--- 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 <ijackson@chiark.greenend.org.uk>  Thu, 07 Jul 2022 11:24:20 +0100

diff --git a/statemc.c b/statemc.c
index deeee365f8b5d1deae8efe577e3226654a38073b..2e496923a3295768bd3a4913114a538272b07011 100644 (file)
--- 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)
        );