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
a02743cc
Commit
a02743cc
authored
Mar 07, 2023
by
Poul-Henning Kamp
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make sure complaints from the starting child process reach stderr
parent
79718684
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
2 deletions
+5
-2
mgt_child.c
bin/varnishd/mgt/mgt_child.c
+4
-1
mgt_util.c
bin/varnishd/mgt/mgt_util.c
+1
-1
No files found.
bin/varnishd/mgt/mgt_child.c
View file @
a02743cc
...
...
@@ -233,12 +233,14 @@ MCH_Fd_Inherit(int fd, const char *what)
* Listen to stdout+stderr from the child
*/
static
const
char
*
whining_child
=
C_ERR
;
static
int
v_matchproto_
(
vlu_f
)
child_line
(
void
*
priv
,
const
char
*
p
)
{
(
void
)
priv
;
MGT_Complain
(
C_INFO
,
"Child (%jd) said %s"
,
(
intmax_t
)
child_pid
,
p
);
MGT_Complain
(
whining_child
,
"Child (%jd) said %s"
,
(
intmax_t
)
child_pid
,
p
);
return
(
0
);
}
...
...
@@ -435,6 +437,7 @@ mgt_launch_child(struct cli *cli)
assert
(
u
==
CLIS_OK
);
fprintf
(
stderr
,
"Child launched OK
\n
"
);
}
whining_child
=
C_INFO
;
AZ
(
ev_listen
);
e
=
VEV_Alloc
();
...
...
bin/varnishd/mgt/mgt_util.c
View file @
a02743cc
...
...
@@ -172,7 +172,7 @@ MGT_Complain(const char *loud, const char *fmt, ...)
else
WRONG
(
"Wrong complaint loudness"
);
if
(
complain_to_stderr
&&
loud
!=
C_CLI
)
if
(
loud
!=
C_CLI
&&
(
complain_to_stderr
||
loud
!=
C_DEBUG
)
)
fprintf
(
stderr
,
"%s %s
\n
"
,
loud
,
VSB_data
(
vsb
));
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