]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUILD: contrib/prometheus: fix build breakage caused by move of idle_pct
authorWilly Tarreau <w@1wt.eu>
Sun, 2 Jun 2019 08:38:48 +0000 (10:38 +0200)
committerWilly Tarreau <w@1wt.eu>
Sun, 2 Jun 2019 08:38:48 +0000 (10:38 +0200)
The idle_pct thread-local variable was moved to struct thread_info by
commit 81036f2 ("MINOR: time: move the cpu, mono, and idle time to
thread_info") but not updated in service-prometheus.c, thus breaking
it.

No backport is needed. This fixes GH issue #110.

contrib/prometheus-exporter/service-prometheus.c

index e6fe1dd84b3b14f95e444ff4920e1a56231b0802..3071b8f0fe686cfed4a21d52cab55f6575c2ecff 100644 (file)
@@ -1369,7 +1369,7 @@ static int promex_dump_global_metrics(struct appctx *appctx, struct htx *htx)
                                metric = mkf_u32(0, tasks_run_queue_cur);
                                break;
                        case INF_IDLE_PCT:
-                               metric = mkf_u32(FN_AVG, idle_pct);
+                               metric = mkf_u32(FN_AVG, ti->idle_pct);
                                break;
                        case INF_STOPPING:
                                metric = mkf_u32(0, stopping);