summaryrefslogtreecommitdiffstats
path: root/src/mworker.c
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-03 05:11:11 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-06-03 05:11:11 +0000
commit669c3ea68099b330943d5c3215f0cf381880c3ad (patch)
treeb5fbb97171c91fb994c2c3744dd33073f8f07407 /src/mworker.c
parentReleasing progress-linux version 2.9.7-1~progress7.99u1. (diff)
downloadhaproxy-669c3ea68099b330943d5c3215f0cf381880c3ad.tar.xz
haproxy-669c3ea68099b330943d5c3215f0cf381880c3ad.zip
Merging upstream version 3.0.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/mworker.c')
-rw-r--r--src/mworker.c19
1 files changed, 4 insertions, 15 deletions
diff --git a/src/mworker.c b/src/mworker.c
index c71446a..c4461cc 100644
--- a/src/mworker.c
+++ b/src/mworker.c
@@ -20,10 +20,6 @@
#include <sys/wait.h>
#include <unistd.h>
-#if defined(USE_SYSTEMD)
-#include <systemd/sd-daemon.h>
-#endif
-
#include <haproxy/api.h>
#include <haproxy/cfgparse.h>
#include <haproxy/cli.h>
@@ -45,6 +41,9 @@
#include <haproxy/tools.h>
#include <haproxy/version.h>
+#if defined(USE_SYSTEMD)
+#include <haproxy/systemd.h>
+#endif
static int exitcode = -1;
static int max_reloads = -1; /* number max of reloads a worker can have until they are killed */
@@ -565,17 +564,12 @@ void mworker_cleanup_proc()
/* Displays workers and processes */
static int cli_io_handler_show_proc(struct appctx *appctx)
{
- struct stconn *sc = appctx_sc(appctx);
struct mworker_proc *child;
int old = 0;
int up = date.tv_sec - proc_self->timestamp;
char *uptime = NULL;
char *reloadtxt = NULL;
- /* FIXME: Don't watch the other side !*/
- if (unlikely(sc_opposite(sc)->flags & SC_FL_SHUT_DONE))
- return 1;
-
if (up < 0) /* must never be negative because of clock drift */
up = 0;
@@ -719,15 +713,10 @@ static int cli_parse_reload(char **args, char *payload, struct appctx *appctx, v
static int cli_io_handler_show_loadstatus(struct appctx *appctx)
{
char *env;
- struct stconn *sc = appctx_sc(appctx);
if (!cli_has_level(appctx, ACCESS_LVL_OPER))
return 1;
- /* FIXME: Don't watch the other side !*/
- if (unlikely(sc_opposite(sc)->flags & SC_FL_SHUT_DONE))
- return 1;
-
env = getenv("HAPROXY_LOAD_SUCCESS");
if (!env)
return 1;
@@ -738,7 +727,7 @@ static int cli_io_handler_show_loadstatus(struct appctx *appctx)
chunk_printf(&trash, "Success=1\n");
}
#ifdef USE_SHM_OPEN
- if (startup_logs && b_data(&startup_logs->buf) > 1)
+ if (startup_logs && ring_data(startup_logs) > 1)
chunk_appendf(&trash, "--\n");
if (applet_putchk(appctx, &trash) == -1)