From: William Dauchy Date: Sat, 25 Jan 2020 22:45:18 +0000 (+0100) Subject: MINOR: proxy: clarify number of connections log when stopping X-Git-Tag: v2.2-dev2~64 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1e2256d4d39178c42fa6383cc53ef3b23084aa4b;p=thirdparty%2Fhaproxy.git MINOR: proxy: clarify number of connections log when stopping this log could be sometimes a bit confusing (depending on the number in fact) when you read it (e.g is it the number of active connection?) - only trained eyes knows haproxy output a different log when closing active connections while stopping. Signed-off-by: William Dauchy --- diff --git a/src/proxy.c b/src/proxy.c index dbce45dd43..2d6fe48fd1 100644 --- a/src/proxy.c +++ b/src/proxy.c @@ -975,9 +975,9 @@ struct task *manage_proxy(struct task *t, void *context, unsigned short state) int t; t = tick_remain(now_ms, p->stop_time); if (t == 0) { - ha_warning("Proxy %s stopped (FE: %lld conns, BE: %lld conns).\n", + ha_warning("Proxy %s stopped (cumulated conns: FE: %lld, BE: %lld).\n", p->id, p->fe_counters.cum_conn, p->be_counters.cum_conn); - send_log(p, LOG_WARNING, "Proxy %s stopped (FE: %lld conns, BE: %lld conns).\n", + send_log(p, LOG_WARNING, "Proxy %s stopped (cumulated conns: FE: %lld, BE: %lld).\n", p->id, p->fe_counters.cum_conn, p->be_counters.cum_conn); stop_proxy(p); /* try to free more memory */ @@ -2071,9 +2071,9 @@ static int cli_parse_shutdown_frontend(char **args, char *payload, struct appctx if (px->state == PR_STSTOPPED) return cli_msg(appctx, LOG_NOTICE, "Frontend was already shut down.\n"); - ha_warning("Proxy %s stopped (FE: %lld conns, BE: %lld conns).\n", + ha_warning("Proxy %s stopped (cumulated conns: FE: %lld, BE: %lld).\n", px->id, px->fe_counters.cum_conn, px->be_counters.cum_conn); - send_log(px, LOG_WARNING, "Proxy %s stopped (FE: %lld conns, BE: %lld conns).\n", + send_log(px, LOG_WARNING, "Proxy %s stopped (cumulated conns: FE: %lld, BE: %lld).\n", px->id, px->fe_counters.cum_conn, px->be_counters.cum_conn); stop_proxy(px);