Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
U
unique-xids
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
uplex-varnish
unique-xids
Commits
62764cac
Commit
62764cac
authored
May 06, 2011
by
Tollef Fog Heen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Rename -o to -m ; documentation
Rename -o added in last commit to -m, add documentation.
parent
a69a4882
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
30 additions
and
22 deletions
+30
-22
varnishlog.c
bin/varnishlog/varnishlog.c
+2
-0
varnishncsa.c
bin/varnishncsa/varnishncsa.c
+4
-7
varnishtop.c
bin/varnishtop/varnishtop.c
+2
-2
varnishhist.rst
doc/sphinx/reference/varnishhist.rst
+5
-2
varnishlog.rst
doc/sphinx/reference/varnishlog.rst
+4
-1
varnishncsa.rst
doc/sphinx/reference/varnishncsa.rst
+3
-3
varnishsizes.rst
doc/sphinx/reference/varnishsizes.rst
+5
-2
varnishapi.h
include/varnishapi.h
+3
-3
vsl_arg.c
lib/libvarnishapi/vsl_arg.c
+2
-2
No files found.
bin/varnishlog/varnishlog.c
View file @
62764cac
...
...
@@ -315,6 +315,8 @@ main(int argc, char * const *argv)
case
'w'
:
w_arg
=
optarg
;
break
;
case
'm'
:
o_flag
=
1
;
/* fall through */
default:
if
(
VSL_Arg
(
vd
,
c
,
optarg
)
>
0
)
break
;
...
...
bin/varnishncsa/varnishncsa.c
View file @
62764cac
...
...
@@ -107,7 +107,7 @@ struct VSM_data *vd;
static
size_t
nll
;
static
int
o
_flag
=
0
;
static
int
m
_flag
=
0
;
static
const
char
*
format
;
...
...
@@ -516,7 +516,7 @@ h_ncsa(void *priv, enum vsl_tag tag, unsigned fd,
if
(
!
lp
->
complete
)
return
(
reopen
);
if
(
o
_flag
&&
!
VSL_Matched
(
vd
,
lp
->
bitmap
))
if
(
m
_flag
&&
!
VSL_Matched
(
vd
,
lp
->
bitmap
))
/* -o is in effect matching rule failed. Don't display */
return
(
reopen
);
...
...
@@ -775,11 +775,8 @@ main(int argc, char *argv[])
case
'c'
:
/* XXX: Silently ignored: it's required anyway */
break
;
case
'o'
:
o_flag
=
1
;
if
(
VSL_Arg
(
vd
,
c
,
optarg
)
>
0
)
break
;
usage
();
case
'm'
:
m_flag
=
1
;
/* Fall through */
default:
if
(
VSL_Arg
(
vd
,
c
,
optarg
)
>
0
)
break
;
...
...
bin/varnishtop/varnishtop.c
View file @
62764cac
...
...
@@ -335,8 +335,8 @@ main(int argc, char **argv)
case
'V'
:
varnish_version
(
"varnishtop"
);
exit
(
0
);
case
'
o
'
:
fprintf
(
stderr
,
"-
o
is not supported
\n
"
);
case
'
m
'
:
fprintf
(
stderr
,
"-
m
is not supported
\n
"
);
exit
(
1
);
default:
if
(
VSL_Arg
(
vd
,
o
,
optarg
)
>
0
)
...
...
doc/sphinx/reference/varnishhist.rst
View file @
62764cac
...
...
@@ -15,8 +15,8 @@ Varnish request histogram
SYNOPSIS
========
varnishhist [-b] [-C] [-c] [-d] [-I regex] [-i tag] [-
n varnish_name
]
[-r file] [-V] [-w delay] [-X regex] [-x tag]
varnishhist [-b] [-C] [-c] [-d] [-I regex] [-i tag] [-
m tag:regex ...
]
[-
n varnish_name] [-
r file] [-V] [-w delay] [-X regex] [-x tag]
DESCRIPTION
===========
...
...
@@ -51,6 +51,9 @@ The following options are available:
-i tag Include log entries with the specified tag. If neither
-I nor -i is specified, all log entries are included.
-m tag:regex only count transactions where tag matches regex. Multiple
-m options are AND-ed together.
-n Specifies the name of the varnishd instance to get logs
from. If -n is not specified, the host name is used.
...
...
doc/sphinx/reference/varnishlog.rst
View file @
62764cac
...
...
@@ -17,7 +17,7 @@ SYNOPSIS
========
varnishlog [-a] [-b] [-C] [-c] [-D] [-d] [-I regex] [-i tag] [-k keep]
[-n varnish_name] [-o
[tag regex]
] [-P file] [-r file] [-s num] [-u] [-V]
[-n varnish_name] [-o
] [-m tag:regex ...
] [-P file] [-r file] [-s num] [-u] [-V]
[-w file] [-X regex] [-x tag]
DESCRIPTION
...
...
@@ -51,6 +51,9 @@ The following options are available:
-k num Only show the first num log records.
-m tag:regex only list transactions where tag matches regex. Multiple
-m options are AND-ed together.
-n Specifies the name of the varnishd instance to get logs from. If -n is not
specified, the host name is used.
...
...
doc/sphinx/reference/varnishncsa.rst
View file @
62764cac
...
...
@@ -16,7 +16,7 @@ SYNOPSIS
========
varnishncsa [-a] [-b] [-C] [-c] [-D] [-d] [-f] [-F format] [-I regex]
[-i tag] [-n varnish_name] [-
o tag regex
] [-P file] [-r file] [-V] [-w file]
[-i tag] [-n varnish_name] [-
m tag:regex ...
] [-P file] [-r file] [-V] [-w file]
[-X regex] [-x tag]
...
...
@@ -110,8 +110,8 @@ The following options are available:
How the request was handled, whether it was a
cache hit, miss, pass, pipe or error.
-
o Filter log output to request groups that match a regular
expression on a specified tag
.
-
m tag:regex only list records where tag matches regex. Multiple
-m options are AND-ed together
.
-n Specifies the name of the varnishd instance to get logs
from. If -n is not specified, the host name is used.
...
...
doc/sphinx/reference/varnishsizes.rst
View file @
62764cac
...
...
@@ -17,8 +17,8 @@ Varnish object size request histogram
SYNOPSIS
========
varnishsizes [-b] [-C] [-c] [-d] [-I regex] [-i tag] [-
n varnish_name
]
[-r file] [-V] [-w delay] [-X regex] [-x tag]
varnishsizes [-b] [-C] [-c] [-d] [-I regex] [-i tag] [-
m tag:regex ...
]
[-n varnish_name]
[-r file] [-V] [-w delay] [-X regex] [-x tag]
DESCRIPTION
===========
...
...
@@ -49,6 +49,9 @@ The following options are available:
-i tag Include log entries with the specified tag. If neither -I nor -i
is specified, all log entries are included.
-m tag:regex only list record where tag matches regex. Multiple -m
options are AND-ed together.
-n Specifies the name of the varnishd instance to get logs from.
If -n is not specified, the host name is used.
...
...
include/varnishapi.h
View file @
62764cac
...
...
@@ -214,7 +214,7 @@ int VSL_Open(struct VSM_data *vd, int diag);
* != 0 on failure
*/
#define VSL_ARGS "bCcdI:i:k:n:r:s:X:x:
o
:"
#define VSL_ARGS "bCcdI:i:k:n:r:s:X:x:
m
:"
#define VSL_b_USAGE "[-b]"
#define VSL_c_USAGE "[-c]"
#define VSL_C_USAGE "[-C]"
...
...
@@ -222,8 +222,8 @@ int VSL_Open(struct VSM_data *vd, int diag);
#define VSL_i_USAGE "[-i tag]"
#define VSL_I_USAGE "[-I regexp]"
#define VSL_k_USAGE "[-k keep]"
#define VSL_m_USAGE "[-m tag:regex]"
#define VSL_n_USAGE VSM_n_USAGE
#define VSL_o_USAGE "[-o tag:regex]"
#define VSL_r_USAGE "[-r file]"
#define VSL_s_USAGE "[-s skip]"
#define VSL_x_USAGE "[-x tag]"
...
...
@@ -232,8 +232,8 @@ int VSL_Open(struct VSM_data *vd, int diag);
VSL_i_USAGE " " \
VSL_I_USAGE " " \
VSL_k_USAGE " " \
VSL_m_USAGE " " \
VSL_n_USAGE " " \
VSL_o_USAGE " " \
VSL_r_USAGE " " \
VSL_s_USAGE " " \
VSL_X_USAGE " " \
...
...
lib/libvarnishapi/vsl_arg.c
View file @
62764cac
...
...
@@ -163,7 +163,7 @@ name2tag(const char *n)
}
static
int
vsl_
o
_arg
(
const
struct
VSM_data
*
vd
,
const
char
*
opt
)
vsl_
m
_arg
(
const
struct
VSM_data
*
vd
,
const
char
*
opt
)
{
struct
vsl_re_match
*
m
;
const
char
*
error
;
...
...
@@ -264,7 +264,7 @@ VSL_Arg(struct VSM_data *vd, int arg, const char *opt)
case
'r'
:
return
(
vsl_r_arg
(
vd
,
opt
));
case
's'
:
return
(
vsl_s_arg
(
vd
,
opt
));
case
'I'
:
case
'X'
:
return
(
vsl_IX_arg
(
vd
,
opt
,
arg
));
case
'
o'
:
return
(
vsl_o
_arg
(
vd
,
opt
));
case
'
m'
:
return
(
vsl_m
_arg
(
vd
,
opt
));
case
'C'
:
vd
->
vsl
->
regflags
=
VRE_CASELESS
;
return
(
1
);
default:
return
(
0
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment