From 94d174d6b8da51513defa3bbba662d4332e9902c Mon Sep 17 00:00:00 2001
From: Ian Jackson <ian@chiark.greenend.org.uk>
Date: Mon, 3 May 2010 21:15:54 +0100
Subject: [PATCH] improve some messages

---
 backends/innduct.c | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/backends/innduct.c b/backends/innduct.c
index 944a31d..f8af279 100644
--- a/backends/innduct.c
+++ b/backends/innduct.c
@@ -1116,12 +1116,13 @@ static void vconnfail(Conn *conn, const char *fmt, va_list al) {
   for (i=0, d=conn->xmitd; i<conn->xmitu; i++, d++)
     xmit_free(d);
 
+  LIST_REMOVE(conns,conn);
+
   char *m= xvasprintf(fmt,al);
-  warn("C%d connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s",
-       conn->fd, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
+  warn("C%d[%d] connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s",
+       conn->fd, conns.count, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m);
   free(m);
 
-  LIST_REMOVE(conns,conn);
   conn_dispose(conn);
   check_assign_articles();
 }
@@ -1298,8 +1299,9 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) {
 		     &peer_rd_err, conn);
   if (r) sysdie("oop_rd_read for peer (fd=%d)",conn->fd);
 
-  notice("C%d connected %s", conn->fd, conn->stream ? "streaming" : "plain");
   LIST_ADDHEAD(conns, conn);
+  notice("C%d[%d] connected %s",
+	 conns.count, conn->fd, conn->stream ? "streaming" : "plain");
 
   connect_attempt_discard();
   check_assign_articles();
@@ -1899,9 +1901,9 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
     if (code!=205 && code!=503) {
       connfail(conn, "peer gave unexpected response to QUIT: %s", sani);
     } else {
-      notice("C%d idle connection closed by us", conn->fd);
-      assert(!conn_busy);
       LIST_REMOVE(conns,conn);
+      notice("C%d[%d] idle connection closed by us", conns.count, conn->fd);
+      assert(!conn_busy);
       conn_dispose(conn);
     }
     return OOP_CONTINUE;
@@ -1936,8 +1938,8 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev,
     if (conn_busy)
       PEERBADMSG("peer timed us out or stopped accepting articles");
 
-    notice("C%d idle connection closed by peer", conn->fd);
     LIST_REMOVE(conns,conn);
+    notice("C%d[%d] idle connection closed by peer", conns.count, conn->fd);
     conn_dispose(conn);
     return OOP_CONTINUE;
 
@@ -3082,10 +3084,10 @@ static void *inndcomm_event(oop_source *lp, int fd, oop_event e, void *u) {
 	    " to site %s in newsfeeds)", feedfile, sitename);
 
       if (flushing_input_file) {
-	SMS(SEPARATED, max_separated_periods, "recovery flush complete");
+	SMS(SEPARATED, max_separated_periods, "flush complete");
       } else {
 	close_defer();
-	SMS(NORMAL, spontaneous_flush_periods, "flush complete");
+	SMS(NORMAL, spontaneous_flush_periods, "recovery flush complete");
       }
       return OOP_CONTINUE;
 
-- 
2.30.2