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.4-dev6~53 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b62b78be131de1848d71350d369deac07daf448a;p=thirdparty%2Fhaproxy.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 --- diff --git a/src/stats.c b/src/stats.c index 4ddcd7e416..38c4ff904d 100644 --- a/src/stats.c +++ b/src/stats.c @@ -148,6 +148,7 @@ const struct name_desc info_fields[INF_TOTAL_FIELDS] = { [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_CUM_LOG_MSGS] = { .name = "CumRecvLogs", .desc = "Total number of log messages received by log-forwarding listeners on this worker process since started" }, + [INF_BUILD_INFO] = { .name = "Build info", .desc = "Build info" }, }; const struct name_desc stat_fields[ST_F_TOTAL_FIELDS] = { @@ -3835,6 +3836,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); @@ -3911,7 +3913,6 @@ int stats_fill_info(struct field *info, int len) info[INF_BYTES_OUT_RATE] = mkf_u64(FN_RATE, (unsigned long long)read_freq_ctr(&global.out_32bps) * 32); info[INF_DEBUG_COMMANDS_ISSUED] = mkf_u32(0, debug_commands_issued); info[INF_CUM_LOG_MSGS] = mkf_u32(FN_COUNTER, cum_log_messages); - return 1; }