diff --git a/odissey.conf b/odissey.conf index 47230cd0..34bac11d 100644 --- a/odissey.conf +++ b/odissey.conf @@ -12,6 +12,7 @@ odissey { log_debug no pooling "transaction" stats_period 3 + client_max 100 workers 1 listen { @@ -25,7 +26,6 @@ odissey { # tls_key_file "" # tls_ca_file "" # tls_protocols "" - client_max 100 } server "default" { diff --git a/src/od_config.c b/src/od_config.c index f6fb0f86..b52f3683 100644 --- a/src/od_config.c +++ b/src/od_config.c @@ -236,12 +236,6 @@ od_config_parse_listen(od_config_t *config) return -1; config->scheme->readahead = tk->v.num; 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 */ case OD_LTLS_MODE: if (od_config_next(config, OD_LSTRING, &tk) == -1) @@ -682,6 +676,12 @@ od_config_parse(od_config_t *config) return -1; config->scheme->pooling = tk->v.string; 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 */ case OD_LWORKERS: if (od_config_next(config, OD_LNUMBER, &tk) == -1) diff --git a/src/od_scheme.c b/src/od_scheme.c index 69788300..87091f75 100644 --- a/src/od_scheme.c +++ b/src/od_scheme.c @@ -388,6 +388,7 @@ void od_scheme_print(od_scheme_t *scheme, od_log_t *log) od_log(log, "daemonize %s", od_scheme_yes_no(scheme->daemonize)); 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, ""); od_log(log, "listen"); @@ -448,6 +449,7 @@ void od_scheme_print(od_scheme_t *scheme, od_log_t *log) route->discard ? "yes" : "no"); od_log(log, " discard %s", 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_timeout %d", route->pool_timeout); }