From 8b3977ffe36190e45fb974bf813bfbd935ac99a1 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Fri, 18 Jan 2008 11:16:32 +0100 Subject: [PATCH] [BUG] log response byte count, not request Due to a shameless copy-paste typo, the number of bytes logged was from the request and not the response. This bug has been present for a long time. --- src/log.c | 2 +- src/proto_http.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/log.c b/src/log.c index de75aa21e8..8888aa88f4 100644 --- a/src/log.c +++ b/src/log.c @@ -367,7 +367,7 @@ void tcp_sess_log(struct session *s) (s->logs.t_queue >= 0) ? s->logs.t_queue : -1, (s->logs.t_connect >= 0) ? s->logs.t_connect - s->logs.t_queue : -1, (tolog & LW_BYTES) ? "" : "+", s->logs.t_close, - (tolog & LW_BYTES) ? "" : "+", s->logs.bytes_in, + (tolog & LW_BYTES) ? "" : "+", s->logs.bytes_out, sess_term_cond[(s->flags & SN_ERR_MASK) >> SN_ERR_SHIFT], sess_fin_state[(s->flags & SN_FINST_MASK) >> SN_FINST_SHIFT], actconn, fe->feconn, be->beconn, s->srv ? s->srv->cur_sess : 0, diff --git a/src/proto_http.c b/src/proto_http.c index 30bdc39ade..e3723c1b88 100644 --- a/src/proto_http.c +++ b/src/proto_http.c @@ -784,7 +784,7 @@ static void http_sess_log(struct session *s) (s->logs.t_data >= 0) ? s->logs.t_data - s->logs.t_connect : -1, (tolog & LW_BYTES) ? "" : "+", s->logs.t_close, txn->status, - (tolog & LW_BYTES) ? "" : "+", s->logs.bytes_in, + (tolog & LW_BYTES) ? "" : "+", s->logs.bytes_out, txn->cli_cookie ? txn->cli_cookie : "-", txn->srv_cookie ? txn->srv_cookie : "-", sess_term_cond[(s->flags & SN_ERR_MASK) >> SN_ERR_SHIFT], @@ -3129,12 +3129,11 @@ int process_srv(struct session *t) bytes from the server, then this is the right moment. */ if (t->fe->to_log && !(t->logs.logwait & LW_BYTES)) { t->logs.t_close = t->logs.t_data; /* to get a valid end date */ - t->logs.bytes_in = txn->rsp.eoh; + t->logs.bytes_out = txn->rsp.eoh; if (t->fe->to_log & LW_REQ) http_sess_log(t); else tcp_sess_log(t); - t->logs.bytes_in = 0; } /* Note: we must not try to cheat by jumping directly to DATA,