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 -qry parameter allowing to preserve the query string in -uX 

Our use-case for this is a dynamic application that performs routing based on
the query string. Without this option all URLs will just point to the central
entrypoint of this location, making the output completely useless.
This commit is contained in:
Tim Duesterhus 2021-10-18 12:12:02 +02:00 committed by Willy Tarreau
parent 14e7f29e86
commit 24b8d693b2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
admin/halog/halog.c
View File

@ -117,7 +117,8 @@ struct url_stat {
#define FILT_COUNT_COOK_CODES 0x40000000 #define FILT_COUNT_COOK_CODES 0x40000000
#define FILT_COUNT_IP_COUNT 0x80000000 #define FILT_COUNT_IP_COUNT 0x80000000
#define FILT2_TIMESTAMP 0x01 #define FILT2_TIMESTAMP 0x01
#define FILT2_PRESERVE_QUERY 0x02
unsigned int filter = 0; unsigned int filter = 0;
unsigned int filter2 = 0; unsigned int filter2 = 0;
@ -147,7 +148,7 @@ void usage(FILE *output, const char *msg)
"Usage: halog [-h|--help] for long help\n" "Usage: halog [-h|--help] for long help\n"
" halog [-q] [-c] [-m <lines>]\n" " halog [-q] [-c] [-m <lines>]\n"
" {-cc|-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto|-uba|-ubt|-ic}\n" " {-cc|-gt|-pct|-st|-tc|-srv|-u|-uc|-ue|-ua|-ut|-uao|-uto|-uba|-ubt|-ic}\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>] [-qry]\n"
" [-v] [-Q|-QS] [-tcn|-TCN <termcode>] [ -hs|-HS [min][:[max]] ] [ -time [min][:[max]] ] < log\n" " [-v] [-Q|-QS] [-tcn|-TCN <termcode>] [ -hs|-HS [min][:[max]] ] [ -time [min][:[max]] ] < log\n"
"\n", "\n",
msg ? msg : "" msg ? msg : ""
@ -196,7 +197,8 @@ void help()
" -u : by URL, -uc : request count, -ue : error count\n" " -u : by URL, -uc : request count, -ue : error count\n"
" -ua : average response time, -ut : average total time\n" " -ua : average response time, -ut : average total time\n"
" -uao, -uto: average times computed on valid ('OK') requests\n" " -uao, -uto: average times computed on valid ('OK') requests\n"
" -uba, -ubt: average bytes returned, total bytes returned\n", " -uba, -ubt: average bytes returned, total bytes returned\n"
" -qry preserve the query string for per-URL statistics\n",
SOURCE_FIELD,SOURCE_FIELD SOURCE_FIELD,SOURCE_FIELD
); );
exit(0); exit(0);
@ -831,6 +833,8 @@ int main(int argc, char **argv)
filter |= FILT_COUNT_URL_BAVG; filter |= FILT_COUNT_URL_BAVG;
else if (strcmp(argv[0], "-ubt") == 0) else if (strcmp(argv[0], "-ubt") == 0)
filter |= FILT_COUNT_URL_BTOT; filter |= FILT_COUNT_URL_BTOT;
else if (strcmp(argv[0], "-qry") == 0)
filter2 |= FILT2_PRESERVE_QUERY;
else if (strcmp(argv[0], "-ic") == 0) else if (strcmp(argv[0], "-ic") == 0)
filter |= FILT_COUNT_IP_COUNT; filter |= FILT_COUNT_IP_COUNT;
else if (strcmp(argv[0], "-o") == 0) { else if (strcmp(argv[0], "-o") == 0) {
@ -1576,7 +1580,8 @@ void filter_count_url(const char *accept_field, const char *time_field, struct t
/* stop at end of field or first ';' or '?', takes avg 64 ns per line */ /* stop at end of field or first ';' or '?', takes avg 64 ns per line */
e = b; e = b;
do { do {
if (*e == ' ' || *e == '?' || *e == ';') { if (*e == ' '||
(!(filter2 & FILT2_PRESERVE_QUERY) && (*e == '?' || *e == ';'))) {
*(char *)e = 0; *(char *)e = 0;
break; break;
} }