Commit cb052cc3 authored by Nils Goroll's avatar Nils Goroll

the -N option has been retired in varnish-cache master

Ref: e9c70c7306eb94c14768648dca03fc5b6c3252f9
parent d8d880b6
Pipeline #193 skipped
...@@ -17,10 +17,10 @@ SYNOPSIS ...@@ -17,10 +17,10 @@ SYNOPSIS
:: ::
varnishevent [-a] [-d] [-D] [-f configfile] [-F format] [-g grouping] varnishevent [-adDhvV] [-f configfile] [-F format]
[-L txlimit] [-n varnish_name] [-N vsmfile] [-P file] [-g grouping] [-L txlimit] [-n name]
[-q query] [-r file] [-T txtimeout] [-v] [-V] [-w file] [-P pidfile] [-q query] [-r binlog]
[-l logfile] [-T txtimeout] [-w outputfile] [-l logfile]
DESCRIPTION DESCRIPTION
...@@ -103,11 +103,6 @@ OPTIONS ...@@ -103,11 +103,6 @@ OPTIONS
Specify the name of the varnishd instance to get logs Specify the name of the varnishd instance to get logs
from. If -n is not specified, the host name is used. 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 -P file
Write the process' PID to the specified file. Write the process' PID to the specified file.
...@@ -475,8 +470,8 @@ Parameter CLI Option Description ...@@ -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 ``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 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 (useful for testing, debugging and replaying traffic). This parameter and the ``-n``
``-N`` options are mutually exclusive. option are mutually exclusive.
---------------------- ---------- ----------------------------------------------------------------------------------------- ------- ---------------------- ---------- ----------------------------------------------------------------------------------------- -------
``cformat`` ``-F`` Output format for client transactions, using the formatter syntax shown for the ``-F`` default for ``-F`` ``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 option above. By default, client transactions are logged, using the default format
......
...@@ -589,10 +589,10 @@ usage(int status) ...@@ -589,10 +589,10 @@ usage(int status)
{ {
fprintf(stderr, fprintf(stderr,
"usage: varnishevent [-adDhvV] [-f configfile] [-F format]\n" "usage: varnishevent [-adDhvV] [-f configfile] [-F format]\n"
" [-g grouping] [-L txlimit] [-n name] \n" " [-g grouping] [-L txlimit] [-n name]\n"
" [-N vsmfile] [-P pidfile] [-q query] \n" " [-P pidfile] [-q query] [-r binlog]\n"
" [-r binlog] [-T txtimeout] [-w outputfile]\n" " [-T txtimeout] [-w outputfile] [-l logfile]\n"
" [-l logfile]\n"); );
exit(status); exit(status);
} }
...@@ -698,11 +698,6 @@ main(int argc, char *argv[]) ...@@ -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)) { if (! EMPTY(cli_config_filename)) {
printf("Reading config from %s\n", cli_config_filename); printf("Reading config from %s\n", cli_config_filename);
if (CONF_ReadFile(cli_config_filename) != 0) { if (CONF_ReadFile(cli_config_filename) != 0) {
...@@ -712,9 +707,9 @@ main(int argc, char *argv[]) ...@@ -712,9 +707,9 @@ main(int argc, char *argv[])
} }
} }
if (!EMPTY(config.varnish_bindump) && (n_arg || N_arg)) { if (!EMPTY(config.varnish_bindump) && n_arg) {
fprintf(stderr, "Cannot specify -r/varnish.bindump together with -n " fprintf(stderr, "Cannot specify -r/varnish.bindump together with -n"
" or -N\n"); "\n");
usage(EXIT_FAILURE); usage(EXIT_FAILURE);
} }
...@@ -797,10 +792,6 @@ main(int argc, char *argv[]) ...@@ -797,10 +792,6 @@ main(int argc, char *argv[])
LOG_Log(LOG_CRIT, "-n %s: %s\n", n_arg, VSM_Error(vsm)); LOG_Log(LOG_CRIT, "-n %s: %s\n", n_arg, VSM_Error(vsm));
exit(EXIT_FAILURE); 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) { if (VSM_Open(vsm) < 0) {
LOG_Log(LOG_CRIT, "Cannot attach to shared memory for instance %s: " LOG_Log(LOG_CRIT, "Cannot attach to shared memory for instance %s: "
"%s", VSM_Name(vsm), VSM_Error(vsm)); "%s", VSM_Name(vsm), VSM_Error(vsm));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment