Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libvmod-backend_dyn
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
Carl P. Corliss
libvmod-backend_dyn
Commits
45c1121a
Commit
45c1121a
authored
Nov 08, 2015
by
Geoff Simmons
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove the add_probe() function, probe is now an optional argument
of the create() function
parent
b97eab53
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
52 additions
and
27 deletions
+52
-27
b00000.vtc
src/tests/b00000.vtc
+3
-0
b00001.vtc
src/tests/b00001.vtc
+3
-0
b00007.vtc
src/tests/b00007.vtc
+4
-0
b00012.vtc
src/tests/b00012.vtc
+1
-0
b00013.vtc
src/tests/b00013.vtc
+1
-0
b00016.vtc
src/tests/b00016.vtc
+2
-0
b00022.vtc
src/tests/b00022.vtc
+2
-0
b00025.vtc
src/tests/b00025.vtc
+2
-0
b00026.vtc
src/tests/b00026.vtc
+3
-0
b00027.vtc
src/tests/b00027.vtc
+2
-0
b00029.vtc
src/tests/b00029.vtc
+2
-0
b00046.vtc
src/tests/b00046.vtc
+2
-0
b00048.vtc
src/tests/b00048.vtc
+2
-0
c00013.vtc
src/tests/c00013.vtc
+1
-0
c00017.vtc
src/tests/c00017.vtc
+3
-4
vmod.c
src/vmod.c
+17
-19
vmod.vcc
src/vmod.vcc
+2
-4
No files found.
src/tests/b00000.vtc
View file @
45c1121a
...
...
@@ -37,5 +37,8 @@ varnish v1 -expect VBE.vcl1.be.bereq_hdrbytes > 0
varnish v1 -expect VBE.vcl1.be.bereq_bodybytes == 0
varnish v1 -expect VBE.vcl1.be.beresp_hdrbytes == 38
varnish v1 -expect VBE.vcl1.be.beresp_bodybytes == 7
varnish v1 -expect VBE.vcl1.be.happy == 0
varnish v1 -expect VBE.vcl1.be.req == 1
varnish v1 -expect VBE.vcl1.be.conn > 0
varnish v1 -expect s_resp_bodybytes == 7
varnish v1 -expect s_resp_hdrbytes == 167
src/tests/b00001.vtc
View file @
45c1121a
...
...
@@ -32,3 +32,6 @@ client c1 {
varnish v1 -cliok "backend.list -p"
varnish v1 -expect s_pipe == 1
varnish v1 -expect VBE.vcl1.be.happy == 0
varnish v1 -expect VBE.vcl1.be.req == 1
varnish v1 -expect VBE.vcl1.be.conn > 0
src/tests/b00007.vtc
View file @
45c1121a
...
...
@@ -47,3 +47,7 @@ client c1 {
expect resp.status == 200
expect resp.bodylen == "8"
} -run
varnish v1 -expect VBE.vcl1.be.happy == 0
varnish v1 -expect VBE.vcl1.be.req == 2
varnish v1 -expect VBE.vcl1.be.conn > 0
src/tests/b00012.vtc
View file @
45c1121a
...
...
@@ -43,3 +43,4 @@ client c1 {
} -run
varnish v1 -expect sess_readahead == 2
varnish v1 -expect VBE.vcl1.be.happy == 0
src/tests/b00013.vtc
View file @
45c1121a
...
...
@@ -49,3 +49,4 @@ client c1 {
} -run
varnish v1 -expect sess_readahead == 2
varnish v1 -expect VBE.vcl1.be.happy == 0
src/tests/b00016.vtc
View file @
45c1121a
...
...
@@ -61,3 +61,5 @@ client c1 {
rxresp
expect resp.http.X-Backend-Name == "s1"
} -run
varnish v1 -expect VBE.vcl1.s1.happy == 0
src/tests/b00022.vtc
View file @
45c1121a
...
...
@@ -51,3 +51,5 @@ client c1 {
rxresp
expect resp.status == 200
} -run
varnish v1 -expect VBE.vcl1.b1.happy == 0
src/tests/b00025.vtc
View file @
45c1121a
...
...
@@ -47,3 +47,5 @@ client c1 {
rxresp
expect resp.status == 200
} -run
varnish v1 -expect VBE.vcl1.b1.happy == 0
src/tests/b00026.vtc
View file @
45c1121a
...
...
@@ -57,3 +57,6 @@ client c1 {
rxresp
expect resp.status == 200
} -run
varnish v1 -expect VBE.vcl1.b1.happy == 0
varnish v1 -expect VBE.vcl1.b2.happy == 0
src/tests/b00027.vtc
View file @
45c1121a
...
...
@@ -45,3 +45,5 @@ client c1 {
rxresp
expect resp.status == 503
} -run
varnish v1 -expect VBE.vcl1.be.happy == 0
src/tests/b00029.vtc
View file @
45c1121a
...
...
@@ -36,3 +36,5 @@ client c1 {
rxresp
expect resp.bodylen == 130000
} -run
varnish v1 -expect VBE.vcl1.be.happy == 0
src/tests/b00046.vtc
View file @
45c1121a
...
...
@@ -46,3 +46,5 @@ client c1 {
rxresp
send_urgent " "
} -run
varnish v1 -expect VBE.vcl1.be.happy == 0
src/tests/b00048.vtc
View file @
45c1121a
...
...
@@ -58,3 +58,5 @@ client c3 {
client c1 -wait
client c2 -wait
client c3 -wait
varnish v1 -expect VBE.vcl1.s0.happy == 0
src/tests/c00013.vtc
View file @
45c1121a
...
...
@@ -60,3 +60,4 @@ client c1 -wait
varnish v1 -expect busy_sleep == 1
varnish v1 -expect busy_wakeup == 1
varnish v1 -expect VBE.vcl1.be.happy == 0
src/tests/c00017.vtc
View file @
45c1121a
...
...
@@ -37,10 +37,8 @@ varnish v1 -vcl {
sub vcl_init {
if (!backend_dyn.create(name="be", host="${s1_addr}",
port="${s1_port}")) {
return(fail);
}
if (!backend_dyn.add_probe(backend_dyn.by_name("be"), p)) {
port="${s1_port}",
probe=p)) {
return(fail);
}
}
...
...
@@ -49,3 +47,4 @@ varnish v1 -vcl {
sema r1 sync 2
varnish v1 -cli "backend.list -p"
varnish v1 -expect VBE.vcl1.be.happy > 0
src/vmod.c
View file @
45c1121a
...
...
@@ -135,9 +135,10 @@ get_addrname(struct suckaddr *sa)
VCL_BOOL
vmod_create
(
VRT_CTX
,
struct
vmod_priv
*
priv
,
VCL_STRING
vcl_name
,
VCL_STRING
host
,
VCL_STRING
port
,
VCL_STRING
host_header
,
VCL_DURATION
connect_timeout
,
VCL_DURATION
first_byte_timeout
,
VCL_DURATION
between_bytes_timeout
,
VCL_INT
max_connections
)
VCL_STRING
host
,
VCL_STRING
port
,
VCL_PROBE
probe
,
VCL_STRING
host_header
,
VCL_DURATION
connect_timeout
,
VCL_DURATION
first_byte_timeout
,
VCL_DURATION
between_bytes_timeout
,
VCL_INT
max_connections
)
{
struct
belist
*
belist
;
struct
bentry
*
bentry
;
...
...
@@ -205,6 +206,19 @@ vmod_create(VRT_CTX, struct vmod_priv *priv, VCL_STRING vcl_name,
dir
=
VRT_new_backend
(
ctx
,
&
be
);
CHECK_OBJ_NOTNULL
(
dir
,
DIRECTOR_MAGIC
);
if
(
probe
!=
NULL
)
{
struct
backend
*
backend
;
struct
tcp_pool
*
tpool
;
CAST_OBJ_NOTNULL
(
backend
,
dir
->
priv
,
BACKEND_MAGIC
);
AZ
(
backend
->
probe
);
tpool
=
VBT_Ref
(
sa4
,
sa6
);
AN
(
tpool
);
VBP_Insert
(
backend
,
probe
,
tpool
);
AN
(
backend
->
probe
);
}
ALLOC_OBJ
(
bentry
,
BENTRY_MAGIC
);
AN
(
bentry
);
bentry
->
be
=
dir
;
...
...
@@ -286,22 +300,6 @@ vmod_delete(VRT_CTX, struct vmod_priv *priv, VCL_BACKEND be)
return
1
;
}
VCL_BOOL
vmod_add_probe
(
VRT_CTX
,
VCL_BACKEND
be
,
VCL_PROBE
probe
)
{
struct
backend
*
backend
;
CHECK_OBJ_NOTNULL
(
probe
,
VRT_BACKEND_PROBE_MAGIC
);
backend
=
check_and_get_backend
(
ctx
,
be
);
if
(
backend
==
NULL
)
return
0
;
if
(
backend
->
probe
!=
NULL
)
VBP_Remove
(
backend
);
VBP_Insert
(
backend
,
probe
,
backend
->
tcp_pool
);
AN
(
backend
->
probe
);
return
1
;
}
VCL_BOOL
vmod_remove_probe
(
VRT_CTX
,
VCL_BACKEND
be
)
{
...
...
src/vmod.vcc
View file @
45c1121a
...
...
@@ -16,8 +16,8 @@ This is the embedded documentation for the example VMOD. It should
mention what the vmod is intended to do.
$Function BOOL create(PRIV_VCL, STRING name, STRING host, STRING port="",
STRING host_header="", DURATION connect_timeout=0
,
DURATION first_byte_timeout=0,
PROBE probe=0, STRING host_header=""
,
DURATION connect_timeout=0,
DURATION first_byte_timeout=0,
DURATION between_bytes_timeout=0,
INT max_connections=0)
...
...
@@ -25,8 +25,6 @@ $Function BACKEND by_name(PRIV_VCL, STRING name)
$Function BOOL delete(PRIV_VCL, BACKEND be)
$Function BOOL add_probe(BACKEND be, PROBE probe)
$Function BOOL remove_probe(BACKEND be)
$Function BOOL stop_probe(BACKEND be)
...
...
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