chiark
/
gitweb
/
~mdw
/
disorder
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0fa83ca
)
tone down logging some more
author
Richard Kettlewell
<rjk@greenend.org.uk>
Fri, 16 Nov 2007 19:17:42 +0000
(19:17 +0000)
committer
Richard Kettlewell
<rjk@greenend.org.uk>
Fri, 16 Nov 2007 19:17:42 +0000
(19:17 +0000)
server/server.c
patch
|
blob
|
blame
|
history
diff --git
a/server/server.c
b/server/server.c
index ccd08238967754d3c34584733b077e521cab4173..603b7db0922b2d8ba6324111a2207050717c27ba 100644
(file)
--- a/
server/server.c
+++ b/
server/server.c
@@
-126,20
+126,19
@@
static int writer_error(ev_source attribute((unused)) *ev,
void *u) {
struct conn *c = u;
void *u) {
struct conn *c = u;
- D(("server writer_error %d", errno_value));
- info("writer_error S%x %d", c->tag, errno_value);
+ D(("server writer_error S%x %d", c->tag, errno_value));
if(errno_value == 0) {
/* writer is done */
if(errno_value == 0) {
/* writer is done */
- error(errno_value, "S%x writer completed", c->tag); /* TODO */
+ D(("S%x writer completed", c->tag));
} else {
if(errno_value != EPIPE)
error(errno_value, "S%x write error on socket", c->tag);
if(c->r) {
} else {
if(errno_value != EPIPE)
error(errno_value, "S%x write error on socket", c->tag);
if(c->r) {
-
info("cancel reader"
);
+
D(("cancel reader")
);
ev_reader_cancel(c->r);
c->r = 0;
}
ev_reader_cancel(c->r);
c->r = 0;
}
-
info("done cancel reader"
);
+
D(("done cancel reader")
);
}
c->w = 0;
ev_report(ev);
}
c->w = 0;
ev_report(ev);
@@
-155,8
+154,7
@@
static int reader_error(ev_source attribute((unused)) *ev,
void *u) {
struct conn *c = u;
void *u) {
struct conn *c = u;
- D(("server reader_error %d", errno_value));
- info("reader_error S%x %d", c->tag, errno_value);
+ D(("server reader_error S%x %d", c->tag, errno_value));
error(errno_value, "S%x read error on socket", c->tag);
if(c->w)
ev_writer_close(c->w);
error(errno_value, "S%x read error on socket", c->tag);
if(c->w)
ev_writer_close(c->w);
@@
-753,9
+751,9
@@
static int logging_reader_callback(ev_source attribute((unused)) *ev,
ev_reader_consume(reader, bytes);
if(eof) {
/* Oops, that's all for now */
ev_reader_consume(reader, bytes);
if(eof) {
/* Oops, that's all for now */
-
info("logging reader eof"
);
+
D(("logging reader eof")
);
if(c->w) {
if(c->w) {
-
info("close writer"
);
+
D(("close writer")
);
ev_writer_close(c->w);
c->w = 0;
}
ev_writer_close(c->w);
c->w = 0;
}
@@
-1120,10
+1118,10
@@
static int reader_callback(ev_source attribute((unused)) *ev,
if(eof) {
if(bytes)
error(0, "S%x unterminated line", c->tag);
if(eof) {
if(bytes)
error(0, "S%x unterminated line", c->tag);
-
info("normal reader close"
);
+
D(("normal reader close")
);
c->r = 0;
if(c->w) {
c->r = 0;
if(c->w) {
-
info("close associated writer"
);
+
D(("close associated writer")
);
ev_writer_close(c->w);
c->w = 0;
}
ev_writer_close(c->w);
c->w = 0;
}