Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
varnish-cache
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
varnishcache
varnish-cache
Commits
8f8d26c0
Unverified
Commit
8f8d26c0
authored
May 24, 2024
by
Nils Goroll
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add VARNISH_DEFAULT_N environment variable as -n argument default
parent
f3bad421
Changes
13
Hide whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
33 additions
and
3 deletions
+33
-3
varnishadm.c
bin/varnishadm/varnishadm.c
+1
-0
mgt_main.c
bin/varnishd/mgt/mgt_main.c
+1
-1
b00041.vtc
bin/varnishtest/tests/b00041.vtc
+2
-0
b00045.vtc
bin/varnishtest/tests/b00045.vtc
+4
-0
u00003.vtc
bin/varnishtest/tests/u00003.vtc
+4
-0
u00004.vtc
bin/varnishtest/tests/u00004.vtc
+1
-0
u00005.vtc
bin/varnishtest/tests/u00005.vtc
+4
-0
u00006.vtc
bin/varnishtest/tests/u00006.vtc
+3
-0
u00009.vtc
bin/varnishtest/tests/u00009.vtc
+1
-1
changes.rst
doc/changes.rst
+5
-0
vin.c
lib/libvarnish/vin.c
+4
-1
vsm.c
lib/libvarnishapi/vsm.c
+2
-0
vut.c
lib/libvarnishapi/vut.c
+1
-0
No files found.
bin/varnishadm/varnishadm.c
View file @
8f8d26c0
...
...
@@ -467,6 +467,7 @@ main(int argc, char * const *argv)
printf
(
OPTARG
"
\n
"
);
exit
(
0
);
}
n_arg
=
getenv
(
"VARNISH_DEFAULT_N"
);
/*
* By default linux::getopt(3) mangles the argv order, such that
* varnishadm -n bla param.set foo -bar
...
...
bin/varnishd/mgt/mgt_main.c
View file @
8f8d26c0
...
...
@@ -614,7 +614,7 @@ main(int argc, char * const *argv)
const
char
*
i_arg
=
NULL
;
const
char
*
j_arg
=
NULL
;
const
char
*
h_arg
=
"critbit"
;
const
char
*
n_arg
=
NULL
;
const
char
*
n_arg
=
getenv
(
"VARNISH_DEFAULT_N"
)
;
const
char
*
S_arg
=
NULL
;
const
char
*
s_arg
=
"default,100m"
;
const
char
*
W_arg
=
NULL
;
...
...
bin/varnishtest/tests/b00041.vtc
View file @
8f8d26c0
...
...
@@ -93,3 +93,5 @@ shell -expect {Tested} \
{varnishadm -T ${s1_sock} -S ${v1_name}/_.secret test}
shell "varnishadm -n ${v1_name} help > /dev/null"
shell {VARNISH_DEFAULT_N="${v1_name}" varnishadm help > /dev/null}
bin/varnishtest/tests/b00045.vtc
View file @
8f8d26c0
...
...
@@ -25,3 +25,7 @@ shell -err -expect {Error: Varnishd is already running} {
shell -err -expect {Error: Varnishd is already running} {
varnishd -b None -a:0 -n ${tmpdir}/v1 -F
}
shell -err -expect {Error: Varnishd is already running} {
VARNISH_DEFAULT_N="${tmpdir}/v1" varnishd -b None -a:0 -F
}
bin/varnishtest/tests/u00003.vtc
View file @
8f8d26c0
...
...
@@ -118,6 +118,10 @@ shell -err -match "Usage: .*varnishncsa <options>" \
shell -match {^${localhost} 100
${localhost} 0$} \
{varnishncsa -n ${v1_name} -b -d -F "%{Host}i %b"}
# -b with VARNISH_DEFAULT_N
shell -match {^${localhost} 100
${localhost} 0$} \
{VARNISH_DEFAULT_N="${v1_name}" varnishncsa -b -d -F "%{Host}i %b"}
# -c
shell -match {^${localhost} 100
${localhost} \d+
...
...
bin/varnishtest/tests/u00004.vtc
View file @
8f8d26c0
...
...
@@ -13,6 +13,7 @@ client c1 {
} -run
shell -expect "fetch" "varnishtop -n ${v1_name} -1"
shell -expect "fetch" {VARNISH_DEFAULT_N="${v1_name}" varnishtop -1}
process p1 "varnishtop -n ${v1_name} -d" -start
delay 1
...
...
bin/varnishtest/tests/u00005.vtc
View file @
8f8d26c0
...
...
@@ -51,8 +51,12 @@ shell -err -expect "-t: Invalid argument: foo" \
"varnishstat -t foo"
shell -err -expect "Could not get hold of varnishd" \
"varnishstat -n /nonexistent -t 1"
shell -err -expect "Could not get hold of varnishd" \
{VARNISH_DEFAULT_N="/nonexistent" varnishstat -t 1}
shell -expect "MAIN.uptime" \
"varnishstat -n ${v1_name} -1"
shell -expect "MAIN.uptime" \
{VARNISH_DEFAULT_N="${v1_name}" varnishstat -1}
shell -expect "<name>MAIN.uptime</name>" \
"varnishstat -n ${v1_name} -x"
shell -match {"MAIN.uptime":} \
...
...
bin/varnishtest/tests/u00006.vtc
View file @
8f8d26c0
...
...
@@ -131,6 +131,9 @@ process p1 -stop
shell -match "0 CLI[ ]+- Wr 200 [0-9]+ PONG" \
{varnishlog -n ${v1_name} -d -g raw -X "Wr 200 [0-9]+ [^P]"}
shell -match "0 CLI[ ]+- Wr 200 [0-9]+ PONG" \
{VARNISH_DEFAULT_N="${v1_name}" varnishlog -d -g raw -X "Wr 200 [0-9]+ [^P]"}
client c1 {
txreq -url /foo
rxresp
...
...
bin/varnishtest/tests/u00009.vtc
View file @
8f8d26c0
...
...
@@ -9,7 +9,7 @@ varnish v1 -vcl+backend {} -start
process p1 -dump {varnishhist -n ${v1_name}} -start
process p2 -dump {varnishhist -n ${v1_name} -P b:BereqAcct::5:-1:1} -start
process p3 -dump {
varnishhist -n ${v1_name}
-P BerespBodytime -B 2} -start
process p3 -dump {
VARNISH_DEFAULT_N="${v1_name}" varnishhist
-P BerespBodytime -B 2} -start
process p1 -expect-text 24 0 {1e2}
process p2 -expect-text 24 0 {1e-1}
...
...
doc/changes.rst
View file @
8f8d26c0
...
...
@@ -41,6 +41,11 @@ Varnish Cache NEXT (2024-09-15)
.. PLEASE keep this roughly in commit order as shown by git-log / tig
(new to old)
* The environment variable ``VARNISH_DEFAULT_N`` now provides the
default "varnish name" / "workdir" as otherwise specified by he
``-n`` argument to ``varnishd`` and ``varnish*`` utilities except
``varnishtest``.
================================
Varnish Cache 7.5.0 (2024-03-18)
================================
...
...
lib/libvarnish/vin.c
View file @
8f8d26c0
...
...
@@ -71,9 +71,12 @@ VIN_n_Arg(const char *n_arg)
void
VIN_DumpDefaults
(
void
)
{
printf
(
" The default is taken from the ``VARNISH_DEFAULT_N`` "
"environment variable.
\n\n
"
);
printf
(
" Relative paths will be appended to ``%s``.
\n\n
"
,
VARNISH_STATE_DIR
);
printf
(
" The default value is ``%s``.
\n\n
"
,
printf
(
" If neither ``VARNISH_DEFAULT_N`` nor ``-n`` are "
"present, the value is ``%s``.
\n\n
"
,
VARNISH_STATE_DIR
"/"
VARNISH_DEFAULT_REL_NAME
);
printf
(
" Note: These defaults may be distribution specific.
\n\n
"
);
}
lib/libvarnishapi/vsm.c
View file @
8f8d26c0
...
...
@@ -346,6 +346,8 @@ VSM_New(void)
ALLOC_OBJ
(
vd
,
VSM_MAGIC
);
AN
(
vd
);
REPLACE
(
vd
->
wdname
,
getenv
(
"VARNISH_DEFAULT_N"
));
vd
->
mgt
=
vsm_newset
(
VSM_MGT_DIRNAME
);
vd
->
mgt
->
flag_running
=
VSM_MGT_RUNNING
;
vd
->
mgt
->
flag_changed
=
VSM_MGT_CHANGED
;
...
...
lib/libvarnishapi/vut.c
View file @
8f8d26c0
...
...
@@ -263,6 +263,7 @@ VUT_Init(const char *progname, int argc, char * const *argv,
AZ
(
vut
->
vsl
);
vut
->
vsl
=
VSL_New
();
AN
(
vut
->
vsl
);
REPLACE
(
vut
->
n_arg
,
getenv
(
"VARNISH_DEFAULT_N"
));
return
(
vut
);
}
...
...
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