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
0f81a958
Commit
0f81a958
authored
May 13, 2018
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Give VDI->list() a j_flag argument for JSON output.
parent
097daab4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
cache_backend.c
bin/varnishd/cache/cache_backend.c
+3
-1
cache_director.c
bin/varnishd/cache/cache_director.c
+2
-3
vrt.h
include/vrt.h
+1
-1
No files found.
bin/varnishd/cache/cache_backend.c
View file @
0f81a958
...
@@ -411,12 +411,14 @@ vbe_panic(const struct director *d, struct vsb *vsb)
...
@@ -411,12 +411,14 @@ vbe_panic(const struct director *d, struct vsb *vsb)
*/
*/
static
void
static
void
vbe_list
(
const
struct
director
*
d
,
struct
vsb
*
vsb
,
int
vflag
,
int
pflag
)
vbe_list
(
const
struct
director
*
d
,
struct
vsb
*
vsb
,
int
vflag
,
int
pflag
,
int
jflag
)
{
{
struct
backend
*
bp
;
struct
backend
*
bp
;
CHECK_OBJ_NOTNULL
(
d
,
DIRECTOR_MAGIC
);
CHECK_OBJ_NOTNULL
(
d
,
DIRECTOR_MAGIC
);
CAST_OBJ_NOTNULL
(
bp
,
d
->
priv
,
BACKEND_MAGIC
);
CAST_OBJ_NOTNULL
(
bp
,
d
->
priv
,
BACKEND_MAGIC
);
AZ
(
jflag
);
if
(
bp
->
probe
!=
NULL
)
if
(
bp
->
probe
!=
NULL
)
VBP_Status
(
vsb
,
bp
,
vflag
|
pflag
);
VBP_Status
(
vsb
,
bp
,
vflag
|
pflag
);
...
...
bin/varnishd/cache/cache_director.c
View file @
0f81a958
...
@@ -36,7 +36,6 @@
...
@@ -36,7 +36,6 @@
#include "config.h"
#include "config.h"
#include "cache_varnishd.h"
#include "cache_varnishd.h"
#include "cache_director.h"
#include "cache_director.h"
#include "vcli_serve.h"
#include "vcli_serve.h"
...
@@ -292,14 +291,14 @@ do_list(struct cli *cli, struct director *d, void *priv)
...
@@ -292,14 +291,14 @@ do_list(struct cli *cli, struct director *d, void *priv)
VCLI_Out
(
cli
,
"
\n
%-30s %-7s "
,
d
->
vdir
->
cli_name
,
VDI_Ahealth
(
d
));
VCLI_Out
(
cli
,
"
\n
%-30s %-7s "
,
d
->
vdir
->
cli_name
,
VDI_Ahealth
(
d
));
if
(
d
->
vdir
->
methods
->
list
!=
NULL
)
if
(
d
->
vdir
->
methods
->
list
!=
NULL
)
d
->
vdir
->
methods
->
list
(
d
,
cli
->
sb
,
0
,
0
);
d
->
vdir
->
methods
->
list
(
d
,
cli
->
sb
,
0
,
0
,
0
);
else
else
VCLI_Out
(
cli
,
"%-10s"
,
d
->
sick
?
"sick"
:
"healthy"
);
VCLI_Out
(
cli
,
"%-10s"
,
d
->
sick
?
"sick"
:
"healthy"
);
VTIM_format
(
d
->
vdir
->
health_changed
,
time_str
);
VTIM_format
(
d
->
vdir
->
health_changed
,
time_str
);
VCLI_Out
(
cli
,
" %s"
,
time_str
);
VCLI_Out
(
cli
,
" %s"
,
time_str
);
if
((
la
->
p
||
la
->
v
)
&&
d
->
vdir
->
methods
->
list
!=
NULL
)
if
((
la
->
p
||
la
->
v
)
&&
d
->
vdir
->
methods
->
list
!=
NULL
)
d
->
vdir
->
methods
->
list
(
d
,
cli
->
sb
,
la
->
p
,
la
->
v
);
d
->
vdir
->
methods
->
list
(
d
,
cli
->
sb
,
la
->
p
,
la
->
v
,
0
);
return
(
0
);
return
(
0
);
}
}
...
...
include/vrt.h
View file @
0f81a958
...
@@ -426,7 +426,7 @@ typedef enum sess_close vdi_http1pipe_f(VRT_CTX, VCL_BACKEND);
...
@@ -426,7 +426,7 @@ typedef enum sess_close vdi_http1pipe_f(VRT_CTX, VCL_BACKEND);
typedef
void
vdi_event_f
(
VCL_BACKEND
,
enum
vcl_event_e
);
typedef
void
vdi_event_f
(
VCL_BACKEND
,
enum
vcl_event_e
);
typedef
void
vdi_destroy_f
(
VCL_BACKEND
);
typedef
void
vdi_destroy_f
(
VCL_BACKEND
);
typedef
void
vdi_panic_f
(
VCL_BACKEND
,
struct
vsb
*
);
typedef
void
vdi_panic_f
(
VCL_BACKEND
,
struct
vsb
*
);
typedef
void
vdi_list_f
(
VCL_BACKEND
,
struct
vsb
*
,
int
,
int
);
typedef
void
vdi_list_f
(
VCL_BACKEND
,
struct
vsb
*
,
int
,
int
,
int
);
struct
vdi_methods
{
struct
vdi_methods
{
unsigned
magic
;
unsigned
magic
;
...
...
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