mirror of
https://git.haproxy.org/git/haproxy.git/
synced 2025-08-06 23:27:04 +02:00
Revert "BUG/MINOR: master/cli: properly trim the '@@' process name in error messages"
This reverts commit 0e94339eaf
.
This patch was in fact fixing the symptom, not the cause. The root cause
of the problem is that the parser was processing an incomplete line when
looking for '@@'. When the LF is present, this problem does not exist
as it's properly replaced with a zero. This can be verified using socat
in raw mode:
socat /tmp/master.sock STDIO,raw,echo=0
Then entering "@@1 show info" one character at a time will immediately
fail on "@@" without going further. A subsequent patch will fix this.
No backport is needed.
This commit is contained in:
parent
101cc4f334
commit
931d932b3e
@ -2937,7 +2937,7 @@ int pcli_find_bidir_prefix(struct stream *s, struct channel *req, char **str, co
|
||||
|
||||
target_pid = pcli_prefix_to_pid(pid_str + 1);
|
||||
if (target_pid == -1) {
|
||||
memprintf(errmsg, "Can't find the target PID matching the prefix '%.*s'\n", (int)(p - pid_str), pid_str);
|
||||
memprintf(errmsg, "Can't find the target PID matching the prefix '%s'\n", pid_str);
|
||||
ret = -1;
|
||||
goto leave;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user