From: Christopher Faulet <cfaulet@haproxy.com>
Date: Mon, 15 Jul 2019 13:12:33 +0000 (+0200)
Subject: MINOR: contrib/prometheus-exporter: Remove tests on the option 'http-use-htx'
X-Git-Tag: v2.1-dev2~365
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=25994dacb36e251763686b04b07680f259ee61f2;p=thirdparty%2Fhaproxy.git

MINOR: contrib/prometheus-exporter: Remove tests on the option 'http-use-htx'

Configuring the Prometheus service is now always valid for HTTP proxies. So we
don't rely anymore on the flag PR_O2_USE_HTX.
---

diff --git a/contrib/prometheus-exporter/service-prometheus.c b/contrib/prometheus-exporter/service-prometheus.c
index 2aafd4d87b..67914f602f 100644
--- a/contrib/prometheus-exporter/service-prometheus.c
+++ b/contrib/prometheus-exporter/service-prometheus.c
@@ -2239,10 +2239,6 @@ static enum act_parse_ret service_parse_prometheus_exporter(const char **args, i
 		memprintf(err, "Prometheus exporter service only available on 'http-request' rulesets");
 		return ACT_RET_PRS_ERR;
 	}
-	if (!(px->options2 & PR_O2_USE_HTX)) {
-		memprintf(err, "Prometheus exporter service only available for HTX proxies");
-		return ACT_RET_PRS_ERR;
-	}
 
 	/* Add applet pointer in the rule. */
 	rule->applet = promex_applet;