mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-22 14:21:25 +02:00
Code Issues Projects Releases Wiki Activity

MINOR: init: setenv HAPROXY_CFGFILES

Browse Source 
Set the HAPROXY_CFGFILES environment variable which contains the list of
configuration files used to start haproxy, separated by semicolon.
This commit is contained in:
William Lallemand 2019-05-20 11:15:37 +02:00 committed by William Lallemand
parent 7e30b50417
commit 7b302d8dd5
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/haproxy.c
View File

@ -1571,6 +1571,7 @@ static void init(int argc, char **argv)
/* in wait mode, we don't try to read the configuration files */ /* in wait mode, we don't try to read the configuration files */
if (!(global.mode & MODE_MWORKER_WAIT)) { if (!(global.mode & MODE_MWORKER_WAIT)) {
struct buffer *trash = get_trash_chunk();
/* handle cfgfiles that are actually directories */ /* handle cfgfiles that are actually directories */
cfgfiles_expand_directories(); cfgfiles_expand_directories();
@ -1582,6 +1583,11 @@ static void init(int argc, char **argv)
list_for_each_entry(wl, &cfg_cfgfiles, list) { list_for_each_entry(wl, &cfg_cfgfiles, list) {
int ret; int ret;
if (trash->data)
chunk_appendf(trash, ";");
chunk_appendf(trash, "%s", wl->s);
ret = readcfgfile(wl->s); ret = readcfgfile(wl->s);
if (ret == -1) { if (ret == -1) {
ha_alert("Could not open configuration file %s : %s\n", ha_alert("Could not open configuration file %s : %s\n",
@ -1603,6 +1609,9 @@ static void init(int argc, char **argv)
ha_alert("Fatal errors found in configuration.\n"); ha_alert("Fatal errors found in configuration.\n");
exit(1); exit(1);
} }
if (trash->data)
setenv("HAPROXY_CFGFILES", trash->area, 1);
} }
if (global.mode & MODE_MWORKER) { if (global.mode & MODE_MWORKER) {
int proc; int proc;