From 7514a0c51145324dffee6e122b9a04028e16f1d5 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 3 May 2010 21:43:23 +0100 Subject: [PATCH] clarify C%d (now %d) messages --- backends/innduct.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/backends/innduct.c b/backends/innduct.c index 11ab242..ab99267 100644 --- a/backends/innduct.c +++ b/backends/innduct.c @@ -1119,7 +1119,7 @@ static void vconnfail(Conn *conn, const char *fmt, va_list al) { LIST_REMOVE(conns,conn); char *m= xvasprintf(fmt,al); - warn("C%d[%d] connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s", + warn("C%d (now %d) connection failed requeueing " RCI_TRIPLE_FMT_BASE ": %s", conn->fd, conns.count, RCI_TRIPLE_VALS_BASE(requeue, /*nothing*/), m); free(m); @@ -1300,7 +1300,7 @@ static void *connchild_event(oop_source *lp, int fd, oop_event e, void *u) { if (r) sysdie("oop_rd_read for peer (fd=%d)",conn->fd); LIST_ADDHEAD(conns, conn); - notice("C%d[%d] connected %s", + notice("C%d (now %d) connected %s", conn->fd, conns.count, conn->stream ? "streaming" : "plain"); connect_attempt_discard(); @@ -1902,7 +1902,8 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev, connfail(conn, "peer gave unexpected response to QUIT: %s", sani); } else { LIST_REMOVE(conns,conn); - notice("C%d[%d] idle connection closed by us", conn->fd, conns.count); + notice("C%d (now %d) idle connection closed by us", + conn->fd, conns.count); assert(!conn_busy); conn_dispose(conn); } @@ -1939,7 +1940,8 @@ static void *peer_rd_ok(oop_source *lp, oop_read *oread, oop_rd_event ev, PEERBADMSG("peer timed us out or stopped accepting articles"); LIST_REMOVE(conns,conn); - notice("C%d[%d] idle connection closed by peer", conns.count, conn->fd); + notice("C%d (now %d) idle connection closed by peer", + conns.count, conn->fd); conn_dispose(conn); return OOP_CONTINUE; -- 2.30.2