mirror of
https://github.com/nginx/nginx.git
synced 2024-12-19 05:33:52 -06:00
Stream: added preconfiguration step.
This commit is contained in:
parent
c9dae918fd
commit
db5a15d2f9
@ -143,11 +143,26 @@ ngx_stream_block(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/* parse inside the stream{} block */
|
|
||||||
|
|
||||||
pcf = *cf;
|
pcf = *cf;
|
||||||
cf->ctx = ctx;
|
cf->ctx = ctx;
|
||||||
|
|
||||||
|
for (m = 0; cf->cycle->modules[m]; m++) {
|
||||||
|
if (cf->cycle->modules[m]->type != NGX_STREAM_MODULE) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
module = cf->cycle->modules[m]->ctx;
|
||||||
|
|
||||||
|
if (module->preconfiguration) {
|
||||||
|
if (module->preconfiguration(cf) != NGX_OK) {
|
||||||
|
return NGX_CONF_ERROR;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/* parse inside the stream{} block */
|
||||||
|
|
||||||
cf->module_type = NGX_STREAM_MODULE;
|
cf->module_type = NGX_STREAM_MODULE;
|
||||||
cf->cmd_type = NGX_STREAM_MAIN_CONF;
|
cf->cmd_type = NGX_STREAM_MAIN_CONF;
|
||||||
rv = ngx_conf_parse(cf, NULL);
|
rv = ngx_conf_parse(cf, NULL);
|
||||||
|
@ -145,6 +145,7 @@ struct ngx_stream_session_s {
|
|||||||
|
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
|
ngx_int_t (*preconfiguration)(ngx_conf_t *cf);
|
||||||
ngx_int_t (*postconfiguration)(ngx_conf_t *cf);
|
ngx_int_t (*postconfiguration)(ngx_conf_t *cf);
|
||||||
|
|
||||||
void *(*create_main_conf)(ngx_conf_t *cf);
|
void *(*create_main_conf)(ngx_conf_t *cf);
|
||||||
|
@ -88,6 +88,7 @@ static ngx_command_t ngx_stream_access_commands[] = {
|
|||||||
|
|
||||||
|
|
||||||
static ngx_stream_module_t ngx_stream_access_module_ctx = {
|
static ngx_stream_module_t ngx_stream_access_module_ctx = {
|
||||||
|
NULL, /* preconfiguration */
|
||||||
ngx_stream_access_init, /* postconfiguration */
|
ngx_stream_access_init, /* postconfiguration */
|
||||||
|
|
||||||
NULL, /* create main configuration */
|
NULL, /* create main configuration */
|
||||||
|
@ -57,6 +57,7 @@ static ngx_command_t ngx_stream_core_commands[] = {
|
|||||||
|
|
||||||
|
|
||||||
static ngx_stream_module_t ngx_stream_core_module_ctx = {
|
static ngx_stream_module_t ngx_stream_core_module_ctx = {
|
||||||
|
NULL, /* preconfiguration */
|
||||||
NULL, /* postconfiguration */
|
NULL, /* postconfiguration */
|
||||||
|
|
||||||
ngx_stream_core_create_main_conf, /* create main configuration */
|
ngx_stream_core_create_main_conf, /* create main configuration */
|
||||||
|
@ -93,6 +93,7 @@ static ngx_command_t ngx_stream_limit_conn_commands[] = {
|
|||||||
|
|
||||||
|
|
||||||
static ngx_stream_module_t ngx_stream_limit_conn_module_ctx = {
|
static ngx_stream_module_t ngx_stream_limit_conn_module_ctx = {
|
||||||
|
NULL, /* preconfiguration */
|
||||||
ngx_stream_limit_conn_init, /* postconfiguration */
|
ngx_stream_limit_conn_init, /* postconfiguration */
|
||||||
|
|
||||||
NULL, /* create main configuration */
|
NULL, /* create main configuration */
|
||||||
|
@ -314,6 +314,7 @@ static ngx_command_t ngx_stream_proxy_commands[] = {
|
|||||||
|
|
||||||
|
|
||||||
static ngx_stream_module_t ngx_stream_proxy_module_ctx = {
|
static ngx_stream_module_t ngx_stream_proxy_module_ctx = {
|
||||||
|
NULL, /* preconfiguration */
|
||||||
NULL, /* postconfiguration */
|
NULL, /* postconfiguration */
|
||||||
|
|
||||||
NULL, /* create main configuration */
|
NULL, /* create main configuration */
|
||||||
|
@ -132,6 +132,7 @@ static ngx_command_t ngx_stream_ssl_commands[] = {
|
|||||||
|
|
||||||
|
|
||||||
static ngx_stream_module_t ngx_stream_ssl_module_ctx = {
|
static ngx_stream_module_t ngx_stream_ssl_module_ctx = {
|
||||||
|
NULL, /* preconfiguration */
|
||||||
NULL, /* postconfiguration */
|
NULL, /* postconfiguration */
|
||||||
|
|
||||||
NULL, /* create main configuration */
|
NULL, /* create main configuration */
|
||||||
|
@ -39,6 +39,7 @@ static ngx_command_t ngx_stream_upstream_commands[] = {
|
|||||||
|
|
||||||
|
|
||||||
static ngx_stream_module_t ngx_stream_upstream_module_ctx = {
|
static ngx_stream_module_t ngx_stream_upstream_module_ctx = {
|
||||||
|
NULL, /* preconfiguration */
|
||||||
NULL, /* postconfiguration */
|
NULL, /* postconfiguration */
|
||||||
|
|
||||||
ngx_stream_upstream_create_main_conf, /* create main configuration */
|
ngx_stream_upstream_create_main_conf, /* create main configuration */
|
||||||
|
@ -76,6 +76,7 @@ static ngx_command_t ngx_stream_upstream_hash_commands[] = {
|
|||||||
|
|
||||||
|
|
||||||
static ngx_stream_module_t ngx_stream_upstream_hash_module_ctx = {
|
static ngx_stream_module_t ngx_stream_upstream_hash_module_ctx = {
|
||||||
|
NULL, /* preconfiguration */
|
||||||
NULL, /* postconfiguration */
|
NULL, /* postconfiguration */
|
||||||
|
|
||||||
NULL, /* create main configuration */
|
NULL, /* create main configuration */
|
||||||
|
@ -32,6 +32,7 @@ static ngx_command_t ngx_stream_upstream_least_conn_commands[] = {
|
|||||||
|
|
||||||
|
|
||||||
static ngx_stream_module_t ngx_stream_upstream_least_conn_module_ctx = {
|
static ngx_stream_module_t ngx_stream_upstream_least_conn_module_ctx = {
|
||||||
|
NULL, /* preconfiguration */
|
||||||
NULL, /* postconfiguration */
|
NULL, /* postconfiguration */
|
||||||
|
|
||||||
NULL, /* create main configuration */
|
NULL, /* create main configuration */
|
||||||
|
@ -32,6 +32,7 @@ static ngx_command_t ngx_stream_upstream_zone_commands[] = {
|
|||||||
|
|
||||||
|
|
||||||
static ngx_stream_module_t ngx_stream_upstream_zone_module_ctx = {
|
static ngx_stream_module_t ngx_stream_upstream_zone_module_ctx = {
|
||||||
|
NULL, /* preconfiguration */
|
||||||
NULL, /* postconfiguration */
|
NULL, /* postconfiguration */
|
||||||
|
|
||||||
NULL, /* create main configuration */
|
NULL, /* create main configuration */
|
||||||
|
Loading…
Reference in New Issue
Block a user