From: William Lallemand Date: Wed, 12 Dec 2018 12:45:57 +0000 (+0100) Subject: MINOR: cli: change 'show proc' output of old processes X-Git-Tag: v1.9-dev11~84 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=256bf0d37b0aa7d2bc22a5af00a7124092079815;p=thirdparty%2Fhaproxy.git MINOR: cli: change 'show proc' output of old processes Change the output of the relative pid for the old processes, displays "[was: X]" instead of just "X" which was confusing if you want to connect to the CLI of an old PID. --- diff --git a/doc/management.txt b/doc/management.txt index dee7b20f54..03f742cf76 100644 --- a/doc/management.txt +++ b/doc/management.txt @@ -2505,7 +2505,7 @@ Example: 1271 worker 1 0 0d 00h00m00s 1272 worker 2 0 0d 00h00m00s # old workers - 1233 worker 1 3 0d 00h00m43s + 1233 worker [was: 1] 3 0d 00h00m43s In this example, the master has been reloaded 5 times but one of the old diff --git a/src/cli.c b/src/cli.c index c41a8b5a1f..0bb5bb0187 100644 --- a/src/cli.c +++ b/src/cli.c @@ -1426,11 +1426,13 @@ static int cli_io_handler_show_proc(struct appctx *appctx) continue; } chunk_appendf(&trash, "%-15u %-15s %-15u %-15d %dd %02dh%02dm%02ds\n", child->pid, "worker", child->relative_pid, child->reloads, up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60)); -} + } /* displays old processes */ if (old) { + char *msg = NULL; + chunk_appendf(&trash, "# old workers\n"); list_for_each_entry(child, &proc_list, list) { up = now.tv_sec - child->timestamp; @@ -1438,9 +1440,12 @@ static int cli_io_handler_show_proc(struct appctx *appctx) if (child->type != 'w') continue; - if (child->reloads > 0) - chunk_appendf(&trash, "%-15u %-15s %-15u %-15d %dd %02dh%02dm%02ds\n", child->pid, "worker", child->relative_pid, child->reloads, up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60)); + if (child->reloads > 0) { + memprintf(&msg, "[was: %u]", child->relative_pid); + chunk_appendf(&trash, "%-15u %-15s %-15s %-15d %dd %02dh%02dm%02ds\n", child->pid, "worker", msg, child->reloads, up / 86400, (up % 86400) / 3600, (up % 3600) / 60, (up % 60)); + } } + free(msg); } if (ci_putchk(si_ic(si), &trash) == -1) {