upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-07-13 11:09:54 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

MINOR: haload: move statistics header printing to mtask_cb

Browse source 
Move the header printing logic from hld_init to mtask_cb using a static flag.
This ensures the header is displayed only when the main task starts
processing, avoiding issues where the header might be printed before other
haproxy initialization messages or unexpected early exits.
This commit is contained in:
Frederic Lecaille 2026-07-08 17:14:54 +02:00
parent 1d6138909e
commit 0792e211e3
1 changed files with 18 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/haload.c
View file

@ -747,10 +747,28 @@ void update_throttle()
/* main task */
static struct task *mtask_cb(struct task *t, void *context, unsigned int state)
{
static int header_printed;
TRACE_ENTER(HLD_EV_MAIN_TASK);
gettimeofday(&hld_now, NULL);
if (!header_printed) {
header_printed = 1;
if (arg_long >= 2)
printf("#_____time conns tot_conn tot_req tot_bytes"
" err thr cps rps Bps bps ttfb(us) ttlb(us)");
else if (arg_long)
printf("# time conns tot_conn tot_req tot_bytes"
" err cps rps Bps bps ttfb ttlb");
else
printf("# time conns tot_conn tot_req tot_bytes"
" err cps rps bps ttfb");
if (arg_hscd)
printf(" 1xx 2xx 3xx 4xx 5xx");
putchar('\n');
}
update_throttle();
if (tick_is_expired(mtask.show_time, now_ms)) {
hld_summary();
@ -1809,19 +1827,6 @@ static int hld_init(void)
goto leave;
}
if (arg_long >= 2)
printf("#_____time conns tot_conn tot_req tot_bytes"
" err thr cps rps Bps bps ttfb(us) ttlb(us)");
else if (arg_long)
printf("# time conns tot_conn tot_req tot_bytes"
" err cps rps Bps bps ttfb ttlb");
else
printf("# time conns tot_conn tot_req tot_bytes"
" err cps rps bps ttfb");
if (arg_hscd)
printf(" 1xx 2xx 3xx 4xx 5xx");
putchar('\n');
mtask.t->process = mtask_cb;
mtask.t->state |= TASK_RT;
mtask.t->expire = TICK_ETERNITY;