Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnishevent
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
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
varnishevent
Commits
cb052cc3
Commit
cb052cc3
authored
May 10, 2017
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
the -N option has been retired in varnish-cache master
Ref: e9c70c7306eb94c14768648dca03fc5b6c3252f9
parent
d8d880b6
Pipeline
#193
skipped
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
27 deletions
+13
-27
README.rst
README.rst
+6
-11
varnishevent.c
src/varnishevent.c
+7
-16
No files found.
README.rst
View file @
cb052cc3
...
...
@@ -17,10 +17,10 @@ SYNOPSIS
::
varnishevent [-a
] [-d] [-D] [-f configfile] [-F format] [-g grouping
]
[-
L txlimit] [-n varnish_name] [-N vsmfile] [-P fil
e]
[-
q query] [-r file] [-T txtimeout] [-v] [-V] [-w file
]
[-l logfile]
varnishevent [-a
dDhvV] [-f configfile] [-F format
]
[-
g grouping] [-L txlimit] [-n nam
e]
[-
P pidfile] [-q query] [-r binlog
]
[-
T txtimeout] [-w outputfile] [-
l logfile]
DESCRIPTION
...
...
@@ -103,11 +103,6 @@ OPTIONS
Specify the name of the varnishd instance to get logs
from. If -n is not specified, the host name is used.
-N filename
Specify the filename of a stale VSM instance. When using this
option the abandonment checking is disabled.
-P file
Write the process' PID to the specified file.
...
...
@@ -475,8 +470,8 @@ Parameter CLI Option Description
---------------------- ---------- ----------------------------------------------------------------------------------------- -------
``varnish.bindump`` ``-r`` A binary dump of the Varnish shared memory log obtained from ``varnishlog -B -w``. If a none
value is specified, ``varnishevent`` reads from that file instead of a live Varnish log
(useful for testing, debugging and replaying traffic). This parameter and the ``-n``
or
``-N`` options
are mutually exclusive.
(useful for testing, debugging and replaying traffic). This parameter and the ``-n``
option
are mutually exclusive.
---------------------- ---------- ----------------------------------------------------------------------------------------- -------
``cformat`` ``-F`` Output format for client transactions, using the formatter syntax shown for the ``-F`` default for ``-F``
option above. By default, client transactions are logged, using the default format
...
...
src/varnishevent.c
View file @
cb052cc3
...
...
@@ -589,10 +589,10 @@ usage(int status)
{
fprintf
(
stderr
,
"usage: varnishevent [-adDhvV] [-f configfile] [-F format]
\n
"
" [-g grouping] [-L txlimit] [-n name]
\n
"
" [-
N vsmfile] [-P pidfile] [-q query]
\n
"
" [-
r binlog] [-T txtimeout] [-w output
file]
\n
"
" [-l logfile]
\n
"
);
" [-g grouping] [-L txlimit] [-n name]
\n
"
" [-
P pidfile] [-q query] [-r binlog]
\n
"
" [-
T txtimeout] [-w outputfile] [-l log
file]
\n
"
);
exit
(
status
);
}
...
...
@@ -698,11 +698,6 @@ main(int argc, char *argv[])
}
}
if
(
n_arg
&&
N_arg
)
{
fprintf
(
stderr
,
"Cannot have both -n and -N options
\n
"
);
usage
(
EXIT_FAILURE
);
}
if
(
!
EMPTY
(
cli_config_filename
))
{
printf
(
"Reading config from %s
\n
"
,
cli_config_filename
);
if
(
CONF_ReadFile
(
cli_config_filename
)
!=
0
)
{
...
...
@@ -712,9 +707,9 @@ main(int argc, char *argv[])
}
}
if
(
!
EMPTY
(
config
.
varnish_bindump
)
&&
(
n_arg
||
N_arg
)
)
{
fprintf
(
stderr
,
"Cannot specify -r/varnish.bindump together with -n
"
"
or -N
\n
"
);
if
(
!
EMPTY
(
config
.
varnish_bindump
)
&&
n_arg
)
{
fprintf
(
stderr
,
"Cannot specify -r/varnish.bindump together with -n"
"
\n
"
);
usage
(
EXIT_FAILURE
);
}
...
...
@@ -797,10 +792,6 @@ main(int argc, char *argv[])
LOG_Log
(
LOG_CRIT
,
"-n %s: %s
\n
"
,
n_arg
,
VSM_Error
(
vsm
));
exit
(
EXIT_FAILURE
);
}
else
if
(
N_arg
&&
VSM_N_Arg
(
vsm
,
N_arg
)
<=
0
)
{
LOG_Log
(
LOG_CRIT
,
"-N %s: %s
\n
"
,
n_arg
,
VSM_Error
(
vsm
));
exit
(
EXIT_FAILURE
);
}
if
(
VSM_Open
(
vsm
)
<
0
)
{
LOG_Log
(
LOG_CRIT
,
"Cannot attach to shared memory for instance %s: "
"%s"
,
VSM_Name
(
vsm
),
VSM_Error
(
vsm
));
...
...
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