mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2025-09-24 07:11:20 +02:00
Code Issues Projects Releases Wiki Activity

MEDIUM: httpclient: change the init sequence

Browse Source 
Change the init order of the httpclient, a different init sequence is
required to allow a more complicated init.

The init is splitted in two parts:

- the first part is executed before config_check_validity(), which
  allows to create proxy and more advanced stuff than STG_INIT, because
  we might want to use stuff already initialized in haproxy (trash
  buffers for example)

- the second part is executed after the config_check_validity(),
  currently it is used for the log configuration.
This commit is contained in:
William Lallemand 2022-04-22 15:16:09 +02:00
parent b53eb8790e
commit 2c8b0842bb
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/http_client.c
View File

@ -983,8 +983,7 @@ static struct applet httpclient_applet = {
* Initialize the proxy for the HTTP client with 2 servers, one for raw HTTP, * Initialize the proxy for the HTTP client with 2 servers, one for raw HTTP,
* the other for HTTPS. * the other for HTTPS.
*/ */
static int httpclient_precheck()
static int httpclient_init()
{ {
int err_code = 0; int err_code = 0;
char *errmsg = NULL; char *errmsg = NULL;
@ -1070,7 +1069,7 @@ err:
return err_code; return err_code;
} }
static int httpclient_cfg_postparser() static int httpclient_postcheck()
{ {
struct logsrv *logsrv; struct logsrv *logsrv;
struct proxy *curproxy = httpclient_proxy; struct proxy *curproxy = httpclient_proxy;
@ -1127,5 +1126,5 @@ err:
/* initialize the proxy and servers for the HTTP client */ /* initialize the proxy and servers for the HTTP client */
INITCALL0(STG_INIT, httpclient_init); REGISTER_PRE_CHECK(httpclient_precheck);
REGISTER_CONFIG_POSTPARSER("httpclient", httpclient_cfg_postparser); REGISTER_POST_CHECK(httpclient_postcheck);