From: Willy Tarreau <w@1wt.eu>
Date: Tue, 18 Sep 2012 18:05:00 +0000 (+0200)
Subject: MINOR: stats: fill the file and line numbers in the stats frontend
X-Git-Tag: v1.5-dev13~278
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a020fbd593df46995e7671af43d7150a425c7654;p=thirdparty%2Fhaproxy.git

MINOR: stats: fill the file and line numbers in the stats frontend

The stats frontend struct has config file and line which were not set.
They're not used right now but better fill them correctly anyway.
---

diff --git a/src/dumpstats.c b/src/dumpstats.c
index 8564e2d943..ab4c416373 100644
--- a/src/dumpstats.c
+++ b/src/dumpstats.c
@@ -151,7 +151,7 @@ static int stats_accept(struct session *s)
 /* allocate a new stats frontend named <name>, and return it
  * (or NULL in case of lack of memory).
  */
-static struct proxy *alloc_stats_fe(const char *name)
+static struct proxy *alloc_stats_fe(const char *name, const char *file, int line)
 {
 	struct proxy *fe;
 
@@ -166,7 +166,8 @@ static struct proxy *alloc_stats_fe(const char *name)
 	fe->cap = PR_CAP_FE;
 	fe->maxconn = 10;                 /* default to 10 concurrent connections */
 	fe->timeout.client = MS_TO_TICKS(10000); /* default timeout of 10 seconds */
-
+	fe->conf.file = strdup(file);
+	fe->conf.line = line;
 	return fe;
 }
 
@@ -202,7 +203,7 @@ static int stats_parse_global(char **args, int section_type, struct proxy *curpx
 		memcpy(&global.stats_sock.addr, su, sizeof(struct sockaddr_un)); // guaranteed to fit
 
 		if (!global.stats_fe) {
-			if ((global.stats_fe = alloc_stats_fe("GLOBAL")) == NULL) {
+			if ((global.stats_fe = alloc_stats_fe("GLOBAL", file, line)) == NULL) {
 				memprintf(err, "'%s %s' : out of memory trying to allocate a frontend", args[0], args[1]);
 				return -1;
 			}
@@ -296,7 +297,7 @@ static int stats_parse_global(char **args, int section_type, struct proxy *curpx
 			return -1;
 		}
 		if (!global.stats_fe) {
-			if ((global.stats_fe = alloc_stats_fe("GLOBAL")) == NULL) {
+			if ((global.stats_fe = alloc_stats_fe("GLOBAL", file, line)) == NULL) {
 				memprintf(err, "'%s %s' : out of memory trying to allocate a frontend", args[0], args[1]);
 				return -1;
 			}
@@ -312,7 +313,7 @@ static int stats_parse_global(char **args, int section_type, struct proxy *curpx
 		}
 
 		if (!global.stats_fe) {
-			if ((global.stats_fe = alloc_stats_fe("GLOBAL")) == NULL) {
+			if ((global.stats_fe = alloc_stats_fe("GLOBAL", file, line)) == NULL) {
 				memprintf(err, "'%s %s' : out of memory trying to allocate a frontend", args[0], args[1]);
 				return -1;
 			}