Rooba
/
odyssey
mirror of https://github.com/yandex/odyssey.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

odissey: move client_max out of listen and display

This commit is contained in:
Dmitry Simonenko 2017-06-05 18:18:47 +03:00
parent c12f5e8584
commit 502663ecd3
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
odissey.conf
View File

@ -12,6 +12,7 @@ odissey {
log_debug no log_debug no
pooling "transaction" pooling "transaction"
stats_period 3 stats_period 3
client_max 100
workers 1 workers 1
listen { listen {
@ -25,7 +26,6 @@ odissey {
# tls_key_file "" # tls_key_file ""
# tls_ca_file "" # tls_ca_file ""
# tls_protocols "" # tls_protocols ""
client_max 100
} }
server "default" { server "default" {

12
src/od_config.c
View File

@ -236,12 +236,6 @@ od_config_parse_listen(od_config_t *config)
return -1; return -1;
config->scheme->readahead = tk->v.num; config->scheme->readahead = tk->v.num;
continue; continue;
/* client_max */
case OD_LCLIENT_MAX:
if (od_config_next(config, OD_LNUMBER, &tk) == -1)
return -1;
config->scheme->client_max = tk->v.num;
continue;
/* tls_mode */ /* tls_mode */
case OD_LTLS_MODE: case OD_LTLS_MODE:
if (od_config_next(config, OD_LSTRING, &tk) == -1) if (od_config_next(config, OD_LSTRING, &tk) == -1)
@ -682,6 +676,12 @@ od_config_parse(od_config_t *config)
return -1; return -1;
config->scheme->pooling = tk->v.string; config->scheme->pooling = tk->v.string;
continue; continue;
/* client_max */
case OD_LCLIENT_MAX:
if (od_config_next(config, OD_LNUMBER, &tk) == -1)
return -1;
config->scheme->client_max = tk->v.num;
continue;
/* workers */ /* workers */
case OD_LWORKERS: case OD_LWORKERS:
if (od_config_next(config, OD_LNUMBER, &tk) == -1) if (od_config_next(config, OD_LNUMBER, &tk) == -1)

2
src/od_scheme.c
View File

@ -388,6 +388,7 @@ void od_scheme_print(od_scheme_t *scheme, od_log_t *log)
od_log(log, "daemonize %s", od_log(log, "daemonize %s",
od_scheme_yes_no(scheme->daemonize)); od_scheme_yes_no(scheme->daemonize));
od_log(log, "pooling %s", scheme->pooling); od_log(log, "pooling %s", scheme->pooling);
od_log(log, "client_max %d", scheme->client_max);
od_log(log, "workers %d", scheme->workers); od_log(log, "workers %d", scheme->workers);
od_log(log, ""); od_log(log, "");
od_log(log, "listen"); od_log(log, "listen");
@ -448,6 +449,7 @@ void od_scheme_print(od_scheme_t *scheme, od_log_t *log)
route->discard ? "yes" : "no"); route->discard ? "yes" : "no");
od_log(log, " discard %s", od_log(log, " discard %s",
route->discard ? "yes" : "no"); route->discard ? "yes" : "no");
od_log(log, " client_max %d", route->client_max);
od_log(log, " pool_size %d", route->pool_size); od_log(log, " pool_size %d", route->pool_size);
od_log(log, " pool_timeout %d", route->pool_timeout); od_log(log, " pool_timeout %d", route->pool_timeout);
} }