From: Willy Tarreau <w@1wt.eu>
Date: Fri, 6 Mar 2009 12:07:40 +0000 (+0100)
Subject: [CLEANUP] remove last references to term_trace
X-Git-Tag: v1.3.16-rc1~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec22b2c27ace5a267dc736afb04c5dd107bf1d62;p=thirdparty%2Fhaproxy.git

[CLEANUP] remove last references to term_trace

term_trace was very useful while reworking the lower layers but has almost
completely been removed from every place it was referenced. Even the few
remaining ones were not accurate, so it's better to completely remove those
references and re-add them from scratch later if needed.
---

diff --git a/src/client.c b/src/client.c
index 4cb79ed0c2..807d7eafea 100644
--- a/src/client.c
+++ b/src/client.c
@@ -426,13 +426,11 @@ int event_accept(int fd) {
 			 */
 			struct chunk msg = { .str = "HTTP/1.0 200 OK\r\n\r\n", .len = 19 };
 			stream_int_retnclose(&s->si[0], &msg); /* forge a 200 response */
-			trace_term(s, TT_CLIENT_1);
 			t->expire = s->rep->wex;
 		}
 		else if (p->mode == PR_MODE_HEALTH) {  /* health check mode, no client reading */
 			struct chunk msg = { .str = "OK\n", .len = 3 };
 			stream_int_retnclose(&s->si[0], &msg); /* forge an "OK" response */
-			trace_term(s, TT_CLIENT_2);
 			t->expire = s->rep->wex;
 		}
 		else {
diff --git a/src/proto_http.c b/src/proto_http.c
index a8ade23c14..5204284419 100644
--- a/src/proto_http.c
+++ b/src/proto_http.c
@@ -2371,7 +2371,6 @@ int http_process_tarpit(struct session *s, struct buffer *req)
 	 * It will not cause trouble to the logs because we can exclude
 	 * the tarpitted connections by filtering on the 'PT' status flags.
 	 */
-	trace_term(s, TT_HTTP_SRV_2);
 	s->logs.t_queue = tv_ms_elapsed(&s->logs.tv_accept, &now);
 
 	txn->status = 500;
@@ -3017,7 +3016,6 @@ void produce_content(struct session *s, struct buffer *rep)
 	/* unknown data source or internal error */
 	s->txn.status = 500;
 	stream_int_retnclose(rep->cons, error_message(s, HTTP_ERR_500));
-	trace_term(s, TT_HTTP_CNT_1);
 	if (!(s->flags & SN_ERR_MASK))
 		s->flags |= SN_ERR_PRXCOND;
 	if (!(s->flags & SN_FINST_MASK))
@@ -4387,7 +4385,6 @@ int stats_check_uri_auth(struct session *t, struct proxy *backend)
 		msg.len = sprintf(trash, HTTP_401_fmt, uri_auth->auth_realm);
 		txn->status = 401;
 		stream_int_retnclose(t->req->prod, &msg);
-		trace_term(t, TT_HTTP_URI_1);
 		t->req->analysers = 0;
 		if (!(t->flags & SN_ERR_MASK))
 			t->flags |= SN_ERR_PRXCOND;
diff --git a/src/session.c b/src/session.c
index 4d911a4385..bcfa5c12e1 100644
--- a/src/session.c
+++ b/src/session.c
@@ -1049,10 +1049,9 @@ resync_stream_interface:
 	if (unlikely((global.mode & MODE_DEBUG) &&
 		     (!(global.mode & MODE_QUIET) || (global.mode & MODE_VERBOSE)))) {
 		int len;
-		len = sprintf(trash, "%08x:%s.closed[%04x:%04x] (term_trace=0x%08x)\n",
+		len = sprintf(trash, "%08x:%s.closed[%04x:%04x]\n",
 			      s->uniq_id, s->be->id,
-			      (unsigned short)s->req->prod->fd, (unsigned short)s->req->cons->fd,
-			      s->term_trace);
+			      (unsigned short)s->req->prod->fd, (unsigned short)s->req->cons->fd);
 		write(1, trash, len);
 	}