mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-30 02:01:30 +02:00
Code Issues Projects Releases Wiki Activity

BUG/MEDIUM: log: Eat output data when waiting for appctx shutdown

Browse Source 
When the log applet is executed while a shut is pending, the remaining
output data must always be consumed. Otherwise, this can prevent the stream
to exit, leading to a spinning loop on the applet.

It is 2.8-specific. No backport needed.
This commit is contained in:
Christopher Faulet 2023-04-11 07:56:50 +02:00
parent 9837bd86dc
commit 211452ef9a
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/log.c
View File

@ -3577,8 +3577,10 @@ static void syslog_io_handler(struct appctx *appctx)
char *message; char *message;
size_t size; size_t size;
if (unlikely(se_fl_test(appctx->sedesc, (SE_FL_EOS|SE_FL_ERROR|SE_FL_SHR|SE_FL_SHW)))) if (unlikely(se_fl_test(appctx->sedesc, (SE_FL_EOS|SE_FL_ERROR|SE_FL_SHR|SE_FL_SHW)))) {
co_skip(sc_oc(sc), co_data(sc_oc(sc)));
goto out; goto out;
}
max_accept = l->bind_conf->maxaccept ? l->bind_conf->maxaccept : 1; max_accept = l->bind_conf->maxaccept ? l->bind_conf->maxaccept : 1;
while (co_data(sc_oc(sc))) { while (co_data(sc_oc(sc))) {