RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: mworker/cli: remove comment line for program when useless 

Remove the '# programs' line on 'show proc' output when there are no
program.
This commit is contained in:
William Lallemand 2024-10-24 14:39:41 +02:00
parent 84640aaa2a
commit b49ddae21b
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/mworker.c
View File

@ -599,6 +599,7 @@ static int cli_io_handler_show_proc(struct appctx *appctx)
struct cli_showproc_ctx *ctx = appctx->svcctx; struct cli_showproc_ctx *ctx = appctx->svcctx;
char *uptime = NULL; char *uptime = NULL;
char *reloadtxt = NULL; char *reloadtxt = NULL;
int program_nb = 0;
if (up < 0) /* must never be negative because of clock drift */ if (up < 0) /* must never be negative because of clock drift */
up = 0; up = 0;
@ -665,7 +666,6 @@ static int cli_io_handler_show_proc(struct appctx *appctx)
} }
/* displays external process */ /* displays external process */
chunk_appendf(&trash, "# programs\n");
old = 0; old = 0;
list_for_each_entry(child, &proc_list, list) { list_for_each_entry(child, &proc_list, list) {
up = date.tv_sec - child->timestamp; up = date.tv_sec - child->timestamp;
@ -679,6 +679,9 @@ static int cli_io_handler_show_proc(struct appctx *appctx)
old++; old++;
continue; continue;
} }
if (program_nb == 0)
chunk_appendf(&trash, "# programs\n");
program_nb++;
memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60)); memprintf(&uptime, "%dd%02dh%02dm%02ds", up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60));
chunk_appendf(&trash, "%-15u %-15s %-15d %-15s %-15s\n", child->pid, child->id, child->reloads, uptime, "-"); chunk_appendf(&trash, "%-15u %-15s %-15d %-15s %-15s\n", child->pid, child->id, child->reloads, uptime, "-");
ha_free(&uptime); ha_free(&uptime);