BUG/MAJOR: log-forward: Fix log-forward proxies not fully initialized
Some initialisation for log forward proxies was missing such
as ssl configuration on 'log-forward's 'bind' lines.
After the loop on the proxy initialization code for proxies present
in the main proxies list, this patch force to loop again on this code
for proxies present in the log forward proxies list.
Those two lists should be merged. This will be part of a global
re-work of proxy initialization including peers proxies and resolver
proxies.
This patch was made in first attempt to fix the bug and to facilitate
the backport on older branches waiting for a cleaner re-work on proxies
initialization on the dev branch.
This patch should be backported as far as 2.3.
(cherry picked from commit 3b68b6026161c53936be34b3c837cd3febcceefc)
Signed-off-by: Willy Tarreau <w@1wt.eu>
(cherry picked from commit 42b3d6a0e04f547d35b90f405261bd53aec9badc)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
(cherry picked from commit 2e1095ed33bc5de4328f31cb1b041b294bdca7a7)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
diff --git a/src/cfgparse.c b/src/cfgparse.c
index c7961fe..cdb4161 100644
--- a/src/cfgparse.c
+++ b/src/cfgparse.c
@@ -2633,6 +2633,7 @@
{
int cfgerr = 0;
struct proxy *curproxy = NULL;
+ struct proxy *init_proxies_list = NULL;
struct stktable *t;
struct server *newsrv = NULL;
int err_code = 0;
@@ -2710,7 +2711,11 @@
proxies_list = next;
}
- for (curproxy = proxies_list; curproxy; curproxy = curproxy->next) {
+ /* starting to initialize the main proxies list */
+ init_proxies_list = proxies_list;
+
+init_proxies_list_stage1:
+ for (curproxy = init_proxies_list; curproxy; curproxy = curproxy->next) {
struct switching_rule *rule;
struct server_rule *srule;
struct sticking_rule *mrule;
@@ -2840,11 +2845,16 @@
case PR_MODE_CLI:
cfgerr += proxy_cfg_ensure_no_http(curproxy);
break;
+
case PR_MODE_SYSLOG:
+ /* this mode is initialized as the classic tcp proxy */
+ cfgerr += proxy_cfg_ensure_no_http(curproxy);
+ break;
+
case PR_MODE_PEERS:
case PR_MODES:
/* should not happen, bug gcc warn missing switch statement */
- ha_alert("config : %s '%s' cannot use peers or syslog mode for this proxy. NOTE: PLEASE REPORT THIS TO DEVELOPERS AS YOU'RE NOT SUPPOSED TO BE ABLE TO CREATE A CONFIGURATION TRIGGERING THIS!\n",
+ ha_alert("config: %s '%s' cannot initialize this proxy mode (peers) in this way. NOTE: PLEASE REPORT THIS TO DEVELOPERS AS YOU'RE NOT SUPPOSED TO BE ABLE TO CREATE A CONFIGURATION TRIGGERING THIS!\n",
proxy_type_str(curproxy), curproxy->id);
cfgerr++;
break;
@@ -3969,6 +3979,15 @@
}
}
+ /*
+ * We have just initialized the main proxies list
+ * we must also configure the log-forward proxies list
+ */
+ if (init_proxies_list == proxies_list) {
+ init_proxies_list = cfg_log_forward;
+ goto init_proxies_list_stage1;
+ }
+
/***********************************************************/
/* At this point, target names have already been resolved. */
/***********************************************************/
@@ -4090,7 +4109,11 @@
/* perform the final checks before creating tasks */
- for (curproxy = proxies_list; curproxy; curproxy = curproxy->next) {
+ /* starting to initialize the main proxies list */
+ init_proxies_list = proxies_list;
+
+init_proxies_list_stage2:
+ for (curproxy = init_proxies_list; curproxy; curproxy = curproxy->next) {
struct listener *listener;
unsigned int next_id;
@@ -4212,6 +4235,15 @@
}
/*
+ * We have just initialized the main proxies list
+ * we must also configure the log-forward proxies list
+ */
+ if (init_proxies_list == proxies_list) {
+ init_proxies_list = cfg_log_forward;
+ goto init_proxies_list_stage2;
+ }
+
+ /*
* Recount currently required checks.
*/