chiark
/
gitweb
/
~ian
/
inn-innduct.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
7bad22c
)
clarify C%d (now %d) messages
author
Ian Jackson
<ian@chiark.greenend.org.uk>
Mon, 3 May 2010 20:43:23 +0000
(21:43 +0100)
committer
Ian Jackson
<ian@chiark.greenend.org.uk>
Mon, 3 May 2010 20:43:23 +0000
(21:43 +0100)
backends/innduct.c
patch
|
blob
|
history
diff --git
a/backends/innduct.c
b/backends/innduct.c
index 11ab24243322223020c09405b1d83850ee141ede..ab992673ca150f5e5bdee9d0dfaa1a8c4e8b2c1d 100644
(file)
--- 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);
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);
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);
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();
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);
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);
}
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);
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;
conn_dispose(conn);
return OOP_CONTINUE;