IntenseWebs/nginx
3
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Stream: resolver.

Browse Source
This commit is contained in:
Vladimir Homutov 2016-07-07 13:15:31 +03:00
parent 6810b9f148
commit dea1e999b8
2 changed files with 63 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/stream/ngx_stream.h
View File

@ -141,6 +141,9 @@ typedef struct {
ngx_flag_t tcp_nodelay; ngx_flag_t tcp_nodelay;
ngx_log_t *error_log; ngx_log_t *error_log;
ngx_msec_t resolver_timeout;
ngx_resolver_t *resolver;
} ngx_stream_core_srv_conf_t; } ngx_stream_core_srv_conf_t;

60
src/stream/ngx_stream_core_module.c
View File

@ -22,6 +22,8 @@ static char *ngx_stream_core_server(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf); void *conf);
static char *ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, static char *ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf); void *conf);
static char *ngx_stream_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd,
void *conf);
static ngx_command_t ngx_stream_core_commands[] = { static ngx_command_t ngx_stream_core_commands[] = {
@ -61,6 +63,20 @@ static ngx_command_t ngx_stream_core_commands[] = {
0, 0,
NULL }, NULL },
{ ngx_string("resolver"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_1MORE,
ngx_stream_core_resolver,
NGX_STREAM_SRV_CONF_OFFSET,
0,
NULL },
{ ngx_string("resolver_timeout"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1,
ngx_conf_set_msec_slot,
NGX_STREAM_SRV_CONF_OFFSET,
offsetof(ngx_stream_core_srv_conf_t, resolver_timeout),
NULL },
{ ngx_string("tcp_nodelay"), { ngx_string("tcp_nodelay"),
NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG, NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_FLAG,
ngx_conf_set_flag_slot, ngx_conf_set_flag_slot,
@ -175,6 +191,7 @@ ngx_stream_core_create_srv_conf(ngx_conf_t *cf)
cscf->file_name = cf->conf_file->file.name.data; cscf->file_name = cf->conf_file->file.name.data;
cscf->line = cf->conf_file->line; cscf->line = cf->conf_file->line;
cscf->resolver_timeout = NGX_CONF_UNSET_MSEC;
cscf->tcp_nodelay = NGX_CONF_UNSET; cscf->tcp_nodelay = NGX_CONF_UNSET;
return cscf; return cscf;
@ -187,6 +204,27 @@ ngx_stream_core_merge_srv_conf(ngx_conf_t *cf, void *parent, void *child)
ngx_stream_core_srv_conf_t *prev = parent; ngx_stream_core_srv_conf_t *prev = parent;
ngx_stream_core_srv_conf_t *conf = child; ngx_stream_core_srv_conf_t *conf = child;
ngx_conf_merge_msec_value(conf->resolver_timeout,
prev->resolver_timeout, 30000);
if (conf->resolver == NULL) {
if (prev->resolver == NULL) {
/*
* create dummy resolver in stream {} context
* to inherit it in all servers
*/
prev->resolver = ngx_resolver_create(cf, NULL, 0);
if (prev->resolver == NULL) {
return NGX_CONF_ERROR;
}
}
conf->resolver = prev->resolver;
}
if (conf->handler == NULL) { if (conf->handler == NULL) {
ngx_log_error(NGX_LOG_EMERG, cf->log, 0, ngx_log_error(NGX_LOG_EMERG, cf->log, 0,
"no handler for server in %s:%ui", "no handler for server in %s:%ui",
@ -565,3 +603,25 @@ ngx_stream_core_listen(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
return NGX_CONF_OK; return NGX_CONF_OK;
} }
static char *
ngx_stream_core_resolver(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
{
ngx_stream_core_srv_conf_t *cscf = conf;
ngx_str_t *value;
if (cscf->resolver) {
return "is duplicate";
}
value = cf->args->elts;
cscf->resolver = ngx_resolver_create(cf, &value[1], cf->args->nelts - 1);
if (cscf->resolver == NULL) {
return NGX_CONF_ERROR;
}
return NGX_CONF_OK;
}