diff options
Diffstat (limited to 'src/event')
| -rw-r--r-- | src/event/modules/ngx_epoll_module.c | 5 | ||||
| -rw-r--r-- | src/event/ngx_event.h | 9 |
2 files changed, 4 insertions, 10 deletions
diff --git a/src/event/modules/ngx_epoll_module.c b/src/event/modules/ngx_epoll_module.c index 3f46a83ad..111432b91 100644 --- a/src/event/modules/ngx_epoll_module.c +++ b/src/event/modules/ngx_epoll_module.c @@ -132,12 +132,15 @@ ngx_module_t ngx_epoll_module = { static int ngx_epoll_init(ngx_cycle_t *cycle) { size_t n; + ngx_event_conf_t *ecf; ngx_epoll_conf_t *epcf; + ecf = ngx_event_get_conf(cycle->conf_ctx, ngx_event_core_module); + epcf = ngx_event_get_conf(cycle->conf_ctx, ngx_epoll_module); if (ep == -1) { - ep = epoll_create(/* STUB: open_files / 2 */ 512); + ep = epoll_create(ecf->connections / 2); if (ep == -1) { ngx_log_error(NGX_LOG_EMERG, cycle->log, ngx_errno, diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h index 68d9f8199..a2c1e9cb6 100644 --- a/src/event/ngx_event.h +++ b/src/event/ngx_event.h @@ -20,14 +20,6 @@ typedef struct { #endif -typedef enum { - NGX_ERROR_CRIT = 0, - NGX_ERROR_ERR, - NGX_ERROR_INFO, - NGX_ERROR_IGNORE_ECONNRESET -} ngx_event_log_error_e; - - struct ngx_event_s { void *data; /* TODO rename to handler */ @@ -88,7 +80,6 @@ struct ngx_event_s { unsigned short read_discarded:1; - unsigned short log_error:2; /* ngx_event_log_error_e */ unsigned short unexpected_eof:1; unsigned short deferred_accept:1; |