mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-08-06 23:27:04 +02:00
Code Issues Projects Releases Wiki Activity

[CLEANUP] remove last references to term_trace

Browse Source 
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.
This commit is contained in:
Willy Tarreau 2009-03-06 13:07:40 +01:00
parent 9279562e2a
commit ec22b2c27a
3 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.c
View File

@ -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 {

3
src/proto_http.c
View File

@ -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;

5
src/session.c
View File

@ -1049,10 +1049,9 @@ void process_session(struct task *t, int *next)
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);
}