From 9d0138ab085f4d0ee34fcec4a265b9a8d8aaa4e7 Mon Sep 17 00:00:00 2001
From: Amaury Denoyelle <adenoyelle@haproxy.com>
Date: Fri, 28 May 2021 11:01:52 +0200
Subject: [PATCH] MINOR: server: use parsing ctx for server init addr

Initialize the parsing context in srv_init_addr. This function is called
after configuration check.

This will standardize the stderr output on startup with the parse_server
function.
---
 src/server.c | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/server.c b/src/server.c
index 48e1d3d22..075602e5a 100644
--- a/src/server.c
+++ b/src/server.c
@@ -3742,16 +3742,16 @@ static int srv_iterate_initaddr(struct server *srv)
 		case SRV_IADDR_NONE:
 			srv_set_admin_flag(srv, SRV_ADMF_RMAINT, NULL);
 			if (return_code) {
-				ha_warning("parsing [%s:%d] : 'server %s' : could not resolve address '%s', disabling server.\n",
-					   srv->conf.file, srv->conf.line, srv->id, name);
+				ha_warning("could not resolve address '%s', disabling server.\n",
+					   name);
 			}
 			return return_code;
 
 		case SRV_IADDR_IP:
 			ipcpy(&srv->init_addr, &srv->addr);
 			if (return_code) {
-				ha_warning("parsing [%s:%d] : 'server %s' : could not resolve address '%s', falling back to configured address.\n",
-					   srv->conf.file, srv->conf.line, srv->id, name);
+				ha_warning("could not resolve address '%s', falling back to configured address.\n",
+					   name);
 			}
 			goto out;
 
@@ -3760,14 +3760,10 @@ static int srv_iterate_initaddr(struct server *srv)
 		}
 	}
 
-	if (!return_code) {
-		ha_alert("parsing [%s:%d] : 'server %s' : no method found to resolve address '%s'\n",
-		      srv->conf.file, srv->conf.line, srv->id, name);
-	}
-	else {
-		ha_alert("parsing [%s:%d] : 'server %s' : could not resolve address '%s'.\n",
-		      srv->conf.file, srv->conf.line, srv->id, name);
-	}
+	if (!return_code)
+		ha_alert("no method found to resolve address '%s'.\n", name);
+	else
+		ha_alert("could not resolve address '%s'.\n", name);
 
 	return_code |= ERR_ALERT | ERR_FATAL;
 	return return_code;
@@ -3798,9 +3794,12 @@ int srv_init_addr(void)
 		if (!(curproxy->cap & PR_CAP_BE) || curproxy->disabled)
 			goto srv_init_addr_next;
 
-		for (srv = curproxy->srv; srv; srv = srv->next)
+		for (srv = curproxy->srv; srv; srv = srv->next) {
+			set_usermsgs_ctx(srv->conf.file, srv->conf.line, &srv->obj_type);
 			if (srv->hostname || srv->srvrq)
 				return_code |= srv_iterate_initaddr(srv);
+			reset_usermsgs_ctx();
+		}
 
  srv_init_addr_next:
 		curproxy = curproxy->next;