RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-13 09:01:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: debug: move the "recover now" warn message after the optional notes

Browse Source 
At the end of the too long processing warning added by commit 0950778b3a
("MINOR: debug: add a function to dump a stuck thread"), there can be some
optional notes about lua and memory trimming. However it's a bit awkward
that they appear after the "trying to recover now" message. Let's just move
that message after the notes.
This commit is contained in:
Willy Tarreau 2024-11-07 07:56:13 +01:00
parent 5f4fe20116
commit 5dcf2012fc
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/debug.c
View File

@ -780,9 +780,6 @@ void ha_stuck_warning(int thr)
ha_thread_dump_done(NULL, thr);
}
chunk_printf(&buf, " => Trying to gracefully recover now.\n");
DISGUISE(write(2, buf.area, buf.data));
#ifdef USE_LUA
if (get_tainted() & TAINTED_LUA_STUCK_SHARED && global.nbthread > 1) {
chunk_printf(&buf,
@ -809,6 +806,9 @@ void ha_stuck_warning(int thr)
" 'global' section of your configuration to avoid this in the future.\n");
DISGUISE(write(2, buf.area, buf.data));
}
chunk_printf(&buf, " => Trying to gracefully recover now.\n");
DISGUISE(write(2, buf.area, buf.data));
}
/* Complain with message <msg> on stderr. If <counter> is not NULL, it is