improve some messages

diff --git a/backends/innduct.c b/backends/innduct.c
index 944a31d429be2c44fceb296aa3ce03d363aa7151..f8af279a37693ddabec10495c1ab7ef4d2ddbfd8 100644 (file)
--- 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);
 
   for (i=0, d=conn->xmitd; i<conn->xmitu; i++, d++)
     xmit_free(d);
 

+  LIST_REMOVE(conns,conn);
+

   char *m= xvasprintf(fmt,al);
   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);
 
   free(m);
 

-  LIST_REMOVE(conns,conn);

   conn_dispose(conn);
   check_assign_articles();
 }
   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);
 
                     &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);
   LIST_ADDHEAD(conns, conn);

+  notice("C%d[%d] connected %s",
+        conns.count, conn->fd, conn->stream ? "streaming" : "plain");

 
   connect_attempt_discard();
   check_assign_articles();
 
   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 {
     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);
       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;
       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");
 
     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);
     LIST_REMOVE(conns,conn);

+    notice("C%d[%d] idle connection closed by peer", conns.count, conn->fd);

     conn_dispose(conn);
     return OOP_CONTINUE;
 
     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) {
            " 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();
       } else {
        close_defer();

-       SMS(NORMAL, spontaneous_flush_periods, "flush complete");
+       SMS(NORMAL, spontaneous_flush_periods, "recovery flush complete");

       }
       return OOP_CONTINUE;
 
       }
       return OOP_CONTINUE;