mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-21 13:51:26 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: proxy: clarify number of connections log when stopping

Browse Source 
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 <w.dauchy@criteo.com>
This commit is contained in:
William Dauchy 2020-01-25 23:45:18 +01:00 committed by Willy Tarreau
parent aecd5dcac2
commit 1e2256d4d3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/proxy.c
View File

@ -975,9 +975,9 @@ struct task *manage_proxy(struct task *t, void *context, unsigned short state)
int t; int t;
t = tick_remain(now_ms, p->stop_time); t = tick_remain(now_ms, p->stop_time);
if (t == 0) { 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); 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); p->id, p->fe_counters.cum_conn, p->be_counters.cum_conn);
stop_proxy(p); stop_proxy(p);
/* try to free more memory */ /* 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) if (px->state == PR_STSTOPPED)
return cli_msg(appctx, LOG_NOTICE, "Frontend was already shut down.\n"); 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); 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); px->id, px->fe_counters.cum_conn, px->be_counters.cum_conn);
stop_proxy(px); stop_proxy(px);