]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MINOR: activity: show wall-clock date, not internal date in show activity
authorWilly Tarreau <w@1wt.eu>
Thu, 27 Apr 2023 12:44:49 +0000 (14:44 +0200)
committerWilly Tarreau <w@1wt.eu>
Thu, 27 Apr 2023 12:47:50 +0000 (14:47 +0200)
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

index 7664d0cb155eaefc82568b74cdd917c5a5c2961a..5a7d84487823554ffd9be8b33b19db3d51e870f1 100644 (file)
@@ -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);