From 31d93dad1ebd5eedd312dec27e9d28499b232ccb Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 7 Nov 2024 07:56:13 +0100 Subject: [PATCH] MINOR: debug: move the "recover now" warn message after the optional notes 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. (cherry picked from commit 5dcf2012fc035e790c118590a12240e0769fbcaa) Signed-off-by: Willy Tarreau --- src/debug.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/debug.c b/src/debug.c index ed4609ae3..43425da38 100644 --- a/src/debug.c +++ b/src/debug.c @@ -717,9 +717,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, @@ -746,6 +743,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 on stderr. If is not NULL, it is