RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2025-02-08 22:37:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[MINOR] config: reference file and line with any listener/proxy/server declaration

Browse Source 
Those will be used later for cross-references of conflicts or errors.
This commit is contained in:
Willy Tarreau 2009-10-04 20:54:54 +02:00
parent 9d7e335127
commit 90a570f025
4 changed files with 34 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/types/protocols.h
View File

@ -104,6 +104,11 @@ struct listener {
} perm;
char *interface; /* interface name or NULL */
int maxseg; /* for TCP, advertised MSS */
struct {
const char *file; /* file where the section appears */
int line; /* line where the section appears */
} conf; /* config information */
};
/* This structure contains all information needed to easily handle a protocol.

5
include/types/proxy.h
View File

@ -258,6 +258,11 @@ struct proxy {
int no_options2; /* PR_O2_* */
struct pxcounters counters; /* statistics counters */
struct {
const char *file; /* file where the section appears */
int line; /* line where the section appears */
} conf; /* config information */
};
struct switching_rule {

5
include/types/server.h
View File

@ -131,6 +131,11 @@ struct server {
int puid; /* proxy-unique server ID, used for SNMP */
struct srvcounters counters; /* statistics counters */
struct {
const char *file; /* file where the section appears */
int line; /* line where the section appears */
} conf; /* config information */
};

20
src/cfgparse.c
View File

@ -876,6 +876,8 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
curproxy->next = proxy;
proxy = curproxy;
curproxy->conf.file = file;
curproxy->conf.line = linenum;
LIST_INIT(&curproxy->pendconns);
LIST_INIT(&curproxy->acl);
LIST_INIT(&curproxy->block_cond);
@ -895,10 +897,17 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
/* parse the listener address if any */
if ((curproxy->cap & PR_CAP_FE) && *args[2]) {
struct listener *new, *last = curproxy->listen;
if (!str2listener(args[2], curproxy)) {
err_code |= ERR_FATAL;
goto out;
}
new = curproxy->listen;
while (new != last) {
new->conf.file = file;
new->conf.line = linenum;
new = new->next;
}
global.maxsock++;
}
@ -1044,7 +1053,7 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
/* Now let's parse the proxy-specific keywords */
if (!strcmp(args[0], "bind")) { /* new listen addresses */
struct listener *last_listen;
struct listener *new_listen, *last_listen;
int cur_arg;
if (curproxy == &defproxy) {
@ -1068,6 +1077,13 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
goto out;
}
new_listen = curproxy->listen;
while (new_listen != last_listen) {
new_listen->conf.file = file;
new_listen->conf.line = linenum;
new_listen = new_listen->next;
}
cur_arg = 2;
while (*(args[cur_arg])) {
if (!strcmp(args[cur_arg], "interface")) { /* specifically bind to this interface */
@ -2453,6 +2469,8 @@ int cfg_parse_listen(const char *file, int linenum, char **args, int kwm)
curproxy->srv = newsrv;
newsrv->proxy = curproxy;
newsrv->puid = curproxy->next_svid++;
newsrv->conf.file = file;
newsrv->conf.line = linenum;
LIST_INIT(&newsrv->pendconns);
do_check = 0;