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

[MINOR] stats: make the data dump function reusable for other purposes

Browse Source 
The dump_error_line() function was limited to dump error buffers while
it's perfectly suitable to dump anything else.
This commit is contained in:
Willy Tarreau 2010-03-05 14:58:26 +01:00
parent 8811f8e82e
commit d426a18a04
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/dumpstats.c
View File

@ -2487,7 +2487,7 @@ int stats_dump_sess_to_buffer(struct session *s, struct buffer *rep)
} }
} }
/* print a line of error buffer (limited to 70 bytes) to <out>. The format is : /* print a line of text buffer (limited to 70 bytes) to <out>. The format is :
* <2 spaces> <offset=5 digits> <space or plus> <space> <70 chars max> <\n> * <2 spaces> <offset=5 digits> <space or plus> <space> <70 chars max> <\n>
* which is 60 chars per line. Non-printable chars \t, \n, \r and \e are * which is 60 chars per line. Non-printable chars \t, \n, \r and \e are
* encoded in C format. Other non-printable chars are encoded "\xHH". Original * encoded in C format. Other non-printable chars are encoded "\xHH". Original
@ -2495,8 +2495,8 @@ int stats_dump_sess_to_buffer(struct session *s, struct buffer *rep)
* continuation of a previous truncated line begin with "+" instead of " " * continuation of a previous truncated line begin with "+" instead of " "
* after the offset. The new pointer is returned. * after the offset. The new pointer is returned.
*/ */
static int dump_error_line(struct chunk *out, struct error_snapshot *err, static int dump_text_line(struct chunk *out, const char *buf, int bsize, int len,
int *line, int ptr) int *line, int ptr)
{ {
int end; int end;
unsigned char c; unsigned char c;
@ -2507,8 +2507,8 @@ 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 && ptr < sizeof(err->buf)) { while (ptr < len && ptr < bsize) {
c = err->buf[ptr]; c = buf[ptr];
if (isprint(c) && isascii(c) && c != '\\') { if (isprint(c) && isascii(c) && c != '\\') {
if (out->len > end - 2) if (out->len > end - 2)
break; break;
@ -2533,7 +2533,7 @@ static int dump_error_line(struct chunk *out, struct error_snapshot *err,
out->str[out->len++] = hextab[(c >> 4) & 0xF]; out->str[out->len++] = hextab[(c >> 4) & 0xF];
out->str[out->len++] = hextab[c & 0xF]; out->str[out->len++] = hextab[c & 0xF];
} }
if (err->buf[ptr++] == '\n') { if (buf[ptr++] == '\n') {
/* we had a line break, let's return now */ /* we had a line break, let's return now */
out->str[out->len++] = '\n'; out->str[out->len++] = '\n';
*line = ptr; *line = ptr;
@ -2659,7 +2659,7 @@ int stats_dump_errors_to_buffer(struct session *s, struct buffer *rep)
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_text_line(&msg, es->buf, sizeof(es->buf), es->len, &newline, s->data_ctx.errors.ptr);
if (newptr == s->data_ctx.errors.ptr) if (newptr == s->data_ctx.errors.ptr)
return 0; return 0;