RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: halog: add support for matching queued requests 

-Q outputs all requests which went through at least one queue.
-QS outputs all requests which went through a server queue.
This commit is contained in:
Willy Tarreau 2011-10-13 13:28:36 +02:00
parent 1611e2d4a1
commit 08911ff896
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
contrib/halog/halog.c
View File

@ -31,6 +31,7 @@
#define STATUS_FIELD 10 #define STATUS_FIELD 10
#define TERM_CODES_FIELD 14 #define TERM_CODES_FIELD 14
#define CONN_FIELD 15 #define CONN_FIELD 15
#define QUEUE_LEN_FIELD 16
#define METH_FIELD 17 #define METH_FIELD 17
#define URL_FIELD 18 #define URL_FIELD 18
#define MAXLINE 16384 #define MAXLINE 16384
@ -102,6 +103,8 @@ struct url_stat {
#define FILT_HTTP_STATUS 0x1000000 #define FILT_HTTP_STATUS 0x1000000
#define FILT_INVERT_HTTP_STATUS 0x2000000 #define FILT_INVERT_HTTP_STATUS 0x2000000
#define FILT_QUEUE_ONLY 0x4000000
#define FILT_QUEUE_SRV_ONLY 0x8000000
unsigned int filter = 0; unsigned int filter = 0;
unsigned int filter_invert = 0; unsigned int filter_invert = 0;
@ -126,7 +129,7 @@ void die(const char *msg)
"%s" "%s"
"Usage: halog [-q] [-c] [-v] {-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto}\n" "Usage: halog [-q] [-c] [-v] {-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto}\n"
" [-s <skip>] [-e|-E] [-H] [-rt|-RT <time>] [-ad <delay>] [-ac <count>]\n" " [-s <skip>] [-e|-E] [-H] [-rt|-RT <time>] [-ad <delay>] [-ac <count>]\n"
" [-tcn|-TCN <termcode>] [ -hs|-HS [min][:[max]] ] < log\n" " [-Q|-QS] [-tcn|-TCN <termcode>] [ -hs|-HS [min][:[max]] ] < log\n"
"\n", "\n",
msg ? msg : "" msg ? msg : ""
); );
@ -526,6 +529,10 @@ int main(int argc, char **argv)
filter |= FILT_ERRORS_ONLY | FILT_INVERT_ERRORS; filter |= FILT_ERRORS_ONLY | FILT_INVERT_ERRORS;
else if (strcmp(argv[0], "-H") == 0) else if (strcmp(argv[0], "-H") == 0)
filter |= FILT_HTTP_ONLY; filter |= FILT_HTTP_ONLY;
else if (strcmp(argv[0], "-Q") == 0)
filter |= FILT_QUEUE_ONLY;
else if (strcmp(argv[0], "-QS") == 0)
filter |= FILT_QUEUE_SRV_ONLY;
else if (strcmp(argv[0], "-c") == 0) else if (strcmp(argv[0], "-c") == 0)
filter |= FILT_COUNT_ONLY; filter |= FILT_COUNT_ONLY;
else if (strcmp(argv[0], "-q") == 0) else if (strcmp(argv[0], "-q") == 0)
@ -724,6 +731,35 @@ int main(int argc, char **argv)
test &= (val >= filt_http_status_low && val <= filt_http_status_high) ^ !!(filter & FILT_INVERT_HTTP_STATUS); test &= (val >= filt_http_status_low && val <= filt_http_status_high) ^ !!(filter & FILT_INVERT_HTTP_STATUS);
} }
if (filter & (FILT_QUEUE_ONLY|FILT_QUEUE_SRV_ONLY)) {
/* Check if the server's queue is non-nul */
if (time_field)
b = field_start(time_field, QUEUE_LEN_FIELD - TIME_FIELD + 1);
else
b = field_start(accept_field, QUEUE_LEN_FIELD - ACCEPT_FIELD + 1);
if (unlikely(!*b)) {
truncated_line(linenum, line);
continue;
}
if (*b == '0') {
if (filter & FILT_QUEUE_SRV_ONLY) {
test = 0;
}
else {
do {
b++;
if (*b == '/') {
b++;
break;
}
} while (*b);
test &= ((unsigned char)(*b - '1') < 9);
}
}
}
if (filter & FILT_TERM_CODE_NAME) { if (filter & FILT_TERM_CODE_NAME) {
/* only report corresponding termination code name */ /* only report corresponding termination code name */
if (time_field) if (time_field)