From 82bde18aa48373814e57650c86f029d2dfc11e21 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Thu, 27 Apr 2023 14:44:49 +0200 Subject: [PATCH] BUG/MINOR: activity: show wall-clock date, not internal date in show activity Another case where "now" was used instead of "date" for a publicly visible date that was already incorrect and became worse after commit 28360dc ("MEDIUM: clock: force internal time to wrap early after boot"). No backport is needed. --- src/activity.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/activity.c b/src/activity.c index 7664d0cb1..5a7d84487 100644 --- a/src/activity.c +++ b/src/activity.c @@ -1089,7 +1089,7 @@ static int cli_io_handler_show_activity(struct appctx *appctx) tv_remain(&start_time, &now, &up); chunk_appendf(&trash, "thread_id: %u (%u..%u)\n", tid + 1, 1, global.nbthread); - chunk_appendf(&trash, "date_now: %lu.%06lu\n", (ulong)now.tv_sec, (ulong)now.tv_usec); + chunk_appendf(&trash, "date_now: %lu.%06lu\n", (ulong)date.tv_sec, (ulong)date.tv_usec); chunk_appendf(&trash, "uptime_now: %lu.%06lu\n", (ulong)up.tv_sec, (ulong)up.tv_usec); chunk_appendf(&trash, "ctxsw:"); SHOW_TOT(thr, activity[thr].ctxsw); chunk_appendf(&trash, "tasksw:"); SHOW_TOT(thr, activity[thr].tasksw); -- 2.47.3