RepoMirrors
/
haproxy
mirror of http://git.haproxy.org/git/haproxy.git/
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MINOR: init: move apply_server_state in haproxy.c before MODE_CHECK 

Currently, the function which applies server states provided by the
"old" process is applied after configuration sanity check. This results
in the impossibility to check the validity of the state file during a
regular config check, implying a full start is required, which can be
a problem sometimes.

This patch moves the loading of server_state file before MODE_CHECK.
This commit is contained in:
Baptiste Assmann 2016-11-02 15:33:15 +01:00 committed by Willy Tarreau
parent ceccdd78a7
commit 4215d7d033
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/haproxy.c
View File

@ -952,6 +952,12 @@ void init(int argc, char **argv)
}
#endif
/* Apply server states */
apply_server_state();
for (px = proxy; px; px = px->next)
srv_compute_all_admin_states(px);
if (global.mode & MODE_CHECK) {
struct peers *pr;
struct proxy *px;
@ -973,12 +979,6 @@ void init(int argc, char **argv)
exit(2);
}
/* Apply server states */
apply_server_state();
for (px = proxy; px; px = px->next)
srv_compute_all_admin_states(px);
global_listener_queue_task = task_new();
if (!global_listener_queue_task) {
Alert("Out of memory when initializing global task\n");