Mercurial > hg > nginx

comparison src/os/unix/ngx_process_cycle.c @ 4953:5e9d5786ec06 stable-1.2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge of r4918: cache manager startup with many listen sockets. Fixed failure to start cache manager and cache loader processes if there were more than 512 listening sockets in configuration.
author Maxim Dounin <mdounin@mdounin.ru>
date Mon, 10 Dec 2012 17:46:51 +0000
parents c355ca8f2b2c
children f941cf265cc5
comparison
equal deleted inserted replaced
4952:3795aeb360fb 4953:5e9d5786ec06
1294 ngx_cache_manager_ctx_t *ctx = data; 1294 ngx_cache_manager_ctx_t *ctx = data;
1295 1295
1296 void *ident[4]; 1296 void *ident[4];
1297 ngx_event_t ev; 1297 ngx_event_t ev;
1298 1298
1299 /*
1300 * Set correct process type since closing listening Unix domain socket
1301 * in a master process also removes the Unix domain socket file.
1302 */
1303 ngx_process = NGX_PROCESS_HELPER;
1304
1305 ngx_close_listening_sockets(cycle);
1306
1307 /* Set a moderate number of connections for a helper process. */
1299 cycle->connection_n = 512; 1308 cycle->connection_n = 512;
1300 1309
1301 ngx_process = NGX_PROCESS_HELPER;
1302
1303 ngx_worker_process_init(cycle, -1); 1310 ngx_worker_process_init(cycle, -1);
1304
1305 ngx_close_listening_sockets(cycle);
1306 1311
1307 ngx_memzero(&ev, sizeof(ngx_event_t)); 1312 ngx_memzero(&ev, sizeof(ngx_event_t));
1308 ev.handler = ctx->handler; 1313 ev.handler = ctx->handler;
1309 ev.data = ident; 1314 ev.data = ident;
1310 ev.log = cycle->log; 1315 ev.log = cycle->log;