projects
/
haproxy-2.5.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
6883674
)
MINOR: mworker: ReloadFailed shown depending on failedreload
author
William Lallemand
<wlallemand@haproxy.org>
Wed, 10 Nov 2021 09:57:18 +0000
(10:57 +0100)
committer
William Lallemand
<wlallemand@haproxy.org>
Wed, 10 Nov 2021 14:53:01 +0000
(15:53 +0100)
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.
src/cli.c
patch
|
blob
|
history
diff --git
a/src/cli.c
b/src/cli.c
index
36d11a4
..
ec5283f
100644
(file)
--- 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);
}