From: William Lallemand <wlallemand@haproxy.org>
Date: Fri, 21 Oct 2022 12:03:29 +0000 (+0200)
Subject: MINOR: mworker/cli: does no try to dump the startup-logs w/o USE_SHM_OPEN
X-Git-Tag: v2.7-dev9~146
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1344ebd74e1c86c1362cb659e412bae89c7d4ddf;p=thirdparty%2Fhaproxy.git

MINOR: mworker/cli: does no try to dump the startup-logs w/o USE_SHM_OPEN

When haproxy is compiled without USE_SHM_OPEN, does not try to dump the
startup-logs in the "reload" output, because it won't show anything
interesting.
---

diff --git a/src/mworker.c b/src/mworker.c
index 2d5b6b8f94..fc4dee104c 100644
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -681,7 +681,7 @@ static int cli_io_handler_show_loadstatus(struct appctx *appctx)
 	} else if (strcmp(env, "1") == 0) {
 		chunk_printf(&trash, "Success=1\n");
 	}
-
+#ifdef USE_SHM_OPEN
 	if (startup_logs && b_data(&startup_logs->buf) > 1)
 		chunk_appendf(&trash, "--\n");
 
@@ -693,6 +693,10 @@ static int cli_io_handler_show_loadstatus(struct appctx *appctx)
 		ring_attach_cli(startup_logs, appctx, 0);
 		return 0;
 	}
+#else
+	if (applet_putchk(appctx, &trash) == -1)
+		return 0;
+#endif
 	return 1;
 }