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
3dd6aa06
Commit
3dd6aa06
authored
Aug 10, 2021
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Only MGT_Complain() on stderr when -d or -F flags given.
parent
08132c6f
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
1 deletion
+7
-1
mgt.h
bin/varnishd/mgt/mgt.h
+1
-0
mgt_main.c
bin/varnishd/mgt/mgt_main.c
+3
-0
mgt_util.c
bin/varnishd/mgt/mgt_util.c
+3
-1
No files found.
bin/varnishd/mgt/mgt.h
View file @
3dd6aa06
...
@@ -176,6 +176,7 @@ extern const char C_INFO[]; // Normal stuff, keep a record for later
...
@@ -176,6 +176,7 @@ extern const char C_INFO[]; // Normal stuff, keep a record for later
extern
const
char
C_DEBUG
[];
// More detail than you'd normally want
extern
const
char
C_DEBUG
[];
// More detail than you'd normally want
extern
const
char
C_SECURITY
[];
// Security issues
extern
const
char
C_SECURITY
[];
// Security issues
extern
const
char
C_CLI
[];
// CLI traffic between master and child
extern
const
char
C_CLI
[];
// CLI traffic between master and child
extern
int
complain_to_stderr
;
/* mgt_param.c */
/* mgt_param.c */
void
MCF_InitParams
(
struct
cli
*
);
void
MCF_InitParams
(
struct
cli
*
);
...
...
bin/varnishd/mgt/mgt_main.c
View file @
3dd6aa06
...
@@ -579,6 +579,9 @@ main(int argc, char * const *argv)
...
@@ -579,6 +579,9 @@ main(int argc, char * const *argv)
if
(
!
d_flag
&&
b_arg
==
NULL
&&
!
f_flag
)
if
(
!
d_flag
&&
b_arg
==
NULL
&&
!
f_flag
)
ARGV_ERR
(
"Neither -b nor -f given. (use -f '' to override)
\n
"
);
ARGV_ERR
(
"Neither -b nor -f given. (use -f '' to override)
\n
"
);
if
(
d_flag
||
F_flag
)
complain_to_stderr
=
1
;
/*
/*
* Start out by closing all unwanted file descriptors we might
* Start out by closing all unwanted file descriptors we might
* have inherited from sloppy process control daemons.
* have inherited from sloppy process control daemons.
...
...
bin/varnishd/mgt/mgt_util.c
View file @
3dd6aa06
...
@@ -49,6 +49,8 @@
...
@@ -49,6 +49,8 @@
#include "vav.h"
#include "vav.h"
#include "vct.h"
#include "vct.h"
int
complain_to_stderr
;
/*--------------------------------------------------------------------*/
/*--------------------------------------------------------------------*/
char
*
char
*
...
@@ -170,7 +172,7 @@ MGT_Complain(const char *loud, const char *fmt, ...)
...
@@ -170,7 +172,7 @@ MGT_Complain(const char *loud, const char *fmt, ...)
else
else
WRONG
(
"Wrong complaint loudness"
);
WRONG
(
"Wrong complaint loudness"
);
if
(
loud
!=
C_CLI
)
if
(
complain_to_stderr
&&
loud
!=
C_CLI
)
fprintf
(
stderr
,
"%s %s
\n
"
,
loud
,
VSB_data
(
vsb
));
fprintf
(
stderr
,
"%s %s
\n
"
,
loud
,
VSB_data
(
vsb
));
if
(
!
MGT_DO_DEBUG
(
DBG_VTC_MODE
))
if
(
!
MGT_DO_DEBUG
(
DBG_VTC_MODE
))
...
...
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