From: William Lallemand <wlallemand@haproxy.org>
Date: Wed, 10 Nov 2021 09:57:18 +0000 (+0100)
Subject: MINOR: mworker: ReloadFailed shown depending on failedreload
X-Git-Tag: v2.5-dev14~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ba7c7b5e18e9adc38e54a9900f9b5cb7fbb0d0d;p=thirdparty%2Fhaproxy.git

MINOR: mworker: ReloadFailed shown depending on failedreload

The ReloadFailed prompt in the master CLI is shown only when
failedreloads > 0. It was previously using a check on the wait mode, but
we always use the wait mode now.
---

diff --git a/src/cli.c b/src/cli.c
index 36d11a4acb..ec5283f27f 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -44,6 +44,7 @@
 #include <haproxy/list.h>
 #include <haproxy/listener.h>
 #include <haproxy/log.h>
+#include <haproxy/mworker.h>
 #include <haproxy/mworker-t.h>
 #include <haproxy/pattern-t.h>
 #include <haproxy/peers.h>
@@ -2067,7 +2068,7 @@ void pcli_write_prompt(struct stream *s)
 	} else {
 		if (s->pcli_next_pid == 0)
 			chunk_appendf(msg, "master%s> ",
-			              (global.mode & MODE_MWORKER_WAIT) ? "[ReloadFailed]" : "");
+			              (proc_self->failedreloads > 0) ? "[ReloadFailed]" : "");
 		else
 			chunk_appendf(msg, "%d> ", s->pcli_next_pid);
 	}