Events: moved sockets cloning to ngx_event_init_conf().
Previously, listenings sockets were not cloned if the worker_processes directive was specified after "listen ... reuseport". This also simplifies upcoming configuration check on the number of worker connections, as it needs to know the number of listening sockets before cloning.
This commit is contained in:
parent
1f8fefa0d0
commit
a098d79ec7
|
@ -96,7 +96,7 @@ ngx_create_listening(ngx_conf_t *cf, struct sockaddr *sockaddr,
|
|||
|
||||
|
||||
ngx_int_t
|
||||
ngx_clone_listening(ngx_conf_t *cf, ngx_listening_t *ls)
|
||||
ngx_clone_listening(ngx_cycle_t *cycle, ngx_listening_t *ls)
|
||||
{
|
||||
#if (NGX_HAVE_REUSEPORT)
|
||||
|
||||
|
@ -104,20 +104,19 @@ ngx_clone_listening(ngx_conf_t *cf, ngx_listening_t *ls)
|
|||
ngx_core_conf_t *ccf;
|
||||
ngx_listening_t ols;
|
||||
|
||||
if (!ls->reuseport) {
|
||||
if (!ls->reuseport || ls->worker != 0) {
|
||||
return NGX_OK;
|
||||
}
|
||||
|
||||
ols = *ls;
|
||||
|
||||
ccf = (ngx_core_conf_t *) ngx_get_conf(cf->cycle->conf_ctx,
|
||||
ngx_core_module);
|
||||
ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);
|
||||
|
||||
for (n = 1; n < ccf->worker_processes; n++) {
|
||||
|
||||
/* create a socket for each worker process */
|
||||
|
||||
ls = ngx_array_push(&cf->cycle->listening);
|
||||
ls = ngx_array_push(&cycle->listening);
|
||||
if (ls == NULL) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
|
|
@ -210,7 +210,7 @@ struct ngx_connection_s {
|
|||
|
||||
ngx_listening_t *ngx_create_listening(ngx_conf_t *cf, struct sockaddr *sockaddr,
|
||||
socklen_t socklen);
|
||||
ngx_int_t ngx_clone_listening(ngx_conf_t *cf, ngx_listening_t *ls);
|
||||
ngx_int_t ngx_clone_listening(ngx_cycle_t *cycle, ngx_listening_t *ls);
|
||||
ngx_int_t ngx_set_inherited_sockets(ngx_cycle_t *cycle);
|
||||
ngx_int_t ngx_open_listening_sockets(ngx_cycle_t *cycle);
|
||||
void ngx_configure_listening_sockets(ngx_cycle_t *cycle);
|
||||
|
|
|
@ -410,12 +410,37 @@ ngx_handle_write_event(ngx_event_t *wev, size_t lowat)
|
|||
static char *
|
||||
ngx_event_init_conf(ngx_cycle_t *cycle, void *conf)
|
||||
{
|
||||
#if (NGX_HAVE_REUSEPORT)
|
||||
ngx_uint_t i;
|
||||
ngx_listening_t *ls;
|
||||
#endif
|
||||
|
||||
if (ngx_get_conf(cycle->conf_ctx, ngx_events_module) == NULL) {
|
||||
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,
|
||||
"no \"events\" section in configuration");
|
||||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
#if (NGX_HAVE_REUSEPORT)
|
||||
|
||||
ls = cycle->listening.elts;
|
||||
for (i = 0; i < cycle->listening.nelts; i++) {
|
||||
|
||||
if (!ls[i].reuseport || ls[i].worker != 0) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (ngx_clone_listening(cycle, &ls[i]) != NGX_OK) {
|
||||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
/* cloning may change cycle->listening.elts */
|
||||
|
||||
ls = cycle->listening.elts;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
return NGX_CONF_OK;
|
||||
}
|
||||
|
||||
|
|
|
@ -1685,10 +1685,6 @@ ngx_http_init_listening(ngx_conf_t *cf, ngx_http_conf_port_t *port)
|
|||
break;
|
||||
}
|
||||
|
||||
if (ngx_clone_listening(cf, ls) != NGX_OK) {
|
||||
return NGX_ERROR;
|
||||
}
|
||||
|
||||
addr++;
|
||||
last--;
|
||||
}
|
||||
|
|
|
@ -538,10 +538,6 @@ ngx_stream_optimize_servers(ngx_conf_t *cf, ngx_array_t *ports)
|
|||
break;
|
||||
}
|
||||
|
||||
if (ngx_clone_listening(cf, ls) != NGX_OK) {
|
||||
return NGX_CONF_ERROR;
|
||||
}
|
||||
|
||||
addr++;
|
||||
last--;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue