mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 22:31:28 +02:00
Code Issues Projects Releases Wiki Activity

[MINOR] stats_dump_errors_to_buffer: use buffer_feed_chunk()

Browse Source 
We can simplify the code in the stats functions using buffer_feed_chunk()
instead of buffer_write_chunk(). Let's start with this function. This
patch also fixed an issue where we could dump past the end of the capture
buffer if it is shorter than the captured request.
This commit is contained in:
Willy Tarreau 2009-10-03 23:49:35 +02:00
parent fe8903cc76
commit 61b347342c
2 changed files with 16 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/proto/dumpstats.h
View File

@ -51,7 +51,7 @@ void stats_dump_raw_to_buffer(struct session *s, struct buffer *req);
int stats_dump_http(struct session *s, struct buffer *rep, struct uri_auth *uri); int stats_dump_http(struct session *s, struct buffer *rep, struct uri_auth *uri);
int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri); int stats_dump_proxy(struct session *s, struct proxy *px, struct uri_auth *uri);
void stats_dump_sess_to_buffer(struct session *s, struct buffer *rep); void stats_dump_sess_to_buffer(struct session *s, struct buffer *rep);
void stats_dump_errors_to_buffer(struct session *s, struct buffer *rep); int stats_dump_errors_to_buffer(struct session *s, struct buffer *rep);
#endif /* _PROTO_DUMPSTATS_H */ #endif /* _PROTO_DUMPSTATS_H */

40
src/dumpstats.c
View File

@ -429,9 +429,7 @@ void stats_io_handler(struct stream_interface *si)
si->st0 = 1; // end of command, send prompt si->st0 = 1; // end of command, send prompt
break; break;
case 5: /* errors dump */ case 5: /* errors dump */
stats_dump_errors_to_buffer(s, res); if (stats_dump_errors_to_buffer(s, res))
si->ib->flags |= BF_READ_PARTIAL; /* remove this once we use buffer_feed */
if (s->ana_state == STATS_ST_CLOSE)
si->st0 = 1; // end of command, send prompt si->st0 = 1; // end of command, send prompt
break; break;
default: /* abnormal state or lack of space for prompt */ default: /* abnormal state or lack of space for prompt */
@ -1738,7 +1736,7 @@ static int dump_error_line(struct chunk *out, struct error_snapshot *err,
chunk_printf(out, " %05d%c ", ptr, (ptr == *line) ? ' ' : '+'); chunk_printf(out, " %05d%c ", ptr, (ptr == *line) ? ' ' : '+');
while (ptr < err->len) { while (ptr < err->len && ptr < sizeof(err->buf)) {
c = err->buf[ptr]; c = err->buf[ptr];
if (isprint(c) && isascii(c) && c != '\\') { if (isprint(c) && isascii(c) && c != '\\') {
if (out->len > end - 2) if (out->len > end - 2)
@ -1780,22 +1778,15 @@ static int dump_error_line(struct chunk *out, struct error_snapshot *err,
* It dumps the errors logged in proxies onto the output buffer <rep>. * It dumps the errors logged in proxies onto the output buffer <rep>.
* Expects to be called with client socket shut down on input. * Expects to be called with client socket shut down on input.
* s->data_ctx must have been zeroed first, and the flags properly set. * s->data_ctx must have been zeroed first, and the flags properly set.
* It automatically clears the HIJACK bit from the response buffer. * It returns 0 as long as it does not complete, non-zero upon completion.
*/ */
void stats_dump_errors_to_buffer(struct session *s, struct buffer *rep) int stats_dump_errors_to_buffer(struct session *s, struct buffer *rep)
{ {
extern const char *monthname[12]; extern const char *monthname[12];
struct chunk msg; struct chunk msg;
if (unlikely(rep->flags & (BF_WRITE_ERROR|BF_SHUTW))) { if (unlikely(rep->flags & (BF_WRITE_ERROR|BF_SHUTW)))
s->data_state = DATA_ST_FIN; return 1;
buffer_stop_hijack(rep);
s->ana_state = STATS_ST_CLOSE;
return;
}
if (s->ana_state != STATS_ST_REP)
return;
chunk_init(&msg, trash, sizeof(trash)); chunk_init(&msg, trash, sizeof(trash));
@ -1874,9 +1865,9 @@ void stats_dump_errors_to_buffer(struct session *s, struct buffer *rep)
break; break;
} }
if (buffer_write_chunk(rep, &msg) >= 0) { if (buffer_feed_chunk(rep, &msg) >= 0) {
/* Socket buffer full. Let's try again later from the same point */ /* Socket buffer full. Let's try again later from the same point */
return; return 0;
} }
s->data_ctx.errors.ptr = 0; s->data_ctx.errors.ptr = 0;
s->data_ctx.errors.sid = es->sid; s->data_ctx.errors.sid = es->sid;
@ -1886,24 +1877,24 @@ void stats_dump_errors_to_buffer(struct session *s, struct buffer *rep)
/* the snapshot changed while we were dumping it */ /* the snapshot changed while we were dumping it */
chunk_printf(&msg, chunk_printf(&msg,
" WARNING! update detected on this snapshot, dump interrupted. Please re-check!\n"); " WARNING! update detected on this snapshot, dump interrupted. Please re-check!\n");
if (buffer_write_chunk(rep, &msg) >= 0) if (buffer_feed_chunk(rep, &msg) >= 0)
return; return 0;
goto next; goto next;
} }
/* OK, ptr >= 0, so we have to dump the current line */ /* OK, ptr >= 0, so we have to dump the current line */
while (s->data_ctx.errors.ptr < es->len) { while (s->data_ctx.errors.ptr < es->len && s->data_ctx.errors.ptr < sizeof(es->buf)) {
int newptr; int newptr;
int newline; int newline;
newline = s->data_ctx.errors.bol; newline = s->data_ctx.errors.bol;
newptr = dump_error_line(&msg, es, &newline, s->data_ctx.errors.ptr); newptr = dump_error_line(&msg, es, &newline, s->data_ctx.errors.ptr);
if (newptr == s->data_ctx.errors.ptr) if (newptr == s->data_ctx.errors.ptr)
return; return 0;
if (buffer_write_chunk(rep, &msg) >= 0) { if (buffer_feed_chunk(rep, &msg) >= 0) {
/* Socket buffer full. Let's try again later from the same point */ /* Socket buffer full. Let's try again later from the same point */
return; return 0;
} }
s->data_ctx.errors.ptr = newptr; s->data_ctx.errors.ptr = newptr;
s->data_ctx.errors.bol = newline; s->data_ctx.errors.bol = newline;
@ -1919,8 +1910,7 @@ void stats_dump_errors_to_buffer(struct session *s, struct buffer *rep)
} }
/* dump complete */ /* dump complete */
buffer_stop_hijack(rep); return 1;
s->ana_state = STATS_ST_CLOSE;
} }