From: Adis Nezirovic Date: Fri, 15 Jan 2021 12:12:33 +0000 (+0100) Subject: BUG/MEDIUM: stats: add missing INF_BUILD_INFO definition X-Git-Tag: v2.1.12~65 X-Git-Url: http://git.haproxy.org/?a=commitdiff_plain;h=e03f79ae04d8149a4e864cd17a41c03d9f66a04a;p=haproxy-2.1.git BUG/MEDIUM: stats: add missing INF_BUILD_INFO definition commit 5a982a71656ce885be4b1d4b90b8db31204788a1 ("MINOR: contrib/prometheus-exporter: export build_info") is breaking lua `core.get_info()`. This patch makes sure build_info is correctly initialised in all cases. Reviewed-by: William Dauchy (cherry picked from commit b62b78be131de1848d71350d369deac07daf448a) Signed-off-by: Christopher Faulet (cherry picked from commit d918314545a1cd3e77447a2e57ede10d7e242a2e) Signed-off-by: Christopher Faulet (cherry picked from commit 3ddec3ee7d344112b4e4fbde317f8886a20d66a0) Signed-off-by: Christopher Faulet --- diff --git a/src/stats.c b/src/stats.c index 2d07e54..6786965 100644 --- a/src/stats.c +++ b/src/stats.c @@ -153,6 +153,7 @@ const struct name_desc info_fields[INF_TOTAL_FIELDS] = { [INF_TOTAL_BYTES_OUT] = { .name = "TotalBytesOut", .desc = "Total number of bytes emitted by current worker process since started" }, [INF_BYTES_OUT_RATE] = { .name = "BytesOutRate", .desc = "Number of bytes emitted by current worker process over the last second" }, [INF_DEBUG_COMMANDS_ISSUED] = { .name = "DebugCommandsIssued", .desc = "Number of debug commands issued on this process (anything > 0 is unsafe)" }, + [INF_BUILD_INFO] = { .name = "Build info", .desc = "Build info" }, }; const struct name_desc stat_fields[ST_F_TOTAL_FIELDS] = { @@ -3414,6 +3415,7 @@ int stats_fill_info(struct field *info, int len) info[INF_NAME] = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, PRODUCT_NAME); info[INF_VERSION] = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, haproxy_version); + info[INF_BUILD_INFO] = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, haproxy_version); info[INF_RELEASE_DATE] = mkf_str(FO_PRODUCT|FN_OUTPUT|FS_SERVICE, haproxy_date); info[INF_NBTHREAD] = mkf_u32(FO_CONFIG|FS_SERVICE, global.nbthread);