diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2009-11-23 15:46:21 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2009-11-23 15:46:21 +0000 |
| commit | 72db760eca850562cc89c550c6cf9f54d657f532 (patch) | |
| tree | af6ddc31736caa6dcf4327fd8990aa1ccfab4f41 /src/os/unix | |
| parent | 8019121120853dbdab475ec9091f0aeb2aad7bbb (diff) | |
| download | nginx-72db760eca850562cc89c550c6cf9f54d657f532.tar.gz nginx-72db760eca850562cc89c550c6cf9f54d657f532.zip | |
add NGX_PROCESS_HELPER process status
Diffstat (limited to 'src/os/unix')
| -rw-r--r-- | src/os/unix/ngx_process.c | 1 | ||||
| -rw-r--r-- | src/os/unix/ngx_process_cycle.c | 6 | ||||
| -rw-r--r-- | src/os/unix/ngx_process_cycle.h | 5 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/os/unix/ngx_process.c b/src/os/unix/ngx_process.c index 48ba9d4db..f140d629b 100644 --- a/src/os/unix/ngx_process.c +++ b/src/os/unix/ngx_process.c @@ -388,6 +388,7 @@ ngx_signal_handler(int signo) break; case NGX_PROCESS_WORKER: + case NGX_PROCESS_HELPER: switch (signo) { case ngx_signal_value(NGX_NOACCEPT_SIGNAL): diff --git a/src/os/unix/ngx_process_cycle.c b/src/os/unix/ngx_process_cycle.c index e203ea3c9..06e020e06 100644 --- a/src/os/unix/ngx_process_cycle.c +++ b/src/os/unix/ngx_process_cycle.c @@ -714,6 +714,8 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, void *data) ngx_uint_t i; ngx_connection_t *c; + ngx_process = NGX_PROCESS_WORKER; + ngx_worker_process_init(cycle, 1); ngx_setproctitle("worker process"); @@ -829,8 +831,6 @@ ngx_worker_process_init(ngx_cycle_t *cycle, ngx_uint_t priority) ngx_core_conf_t *ccf; ngx_listening_t *ls; - ngx_process = NGX_PROCESS_WORKER; - if (ngx_set_environment(cycle, NULL) == NULL) { /* fatal */ exit(2); @@ -1289,6 +1289,8 @@ ngx_cache_manager_process_cycle(ngx_cycle_t *cycle, void *data) cycle->connection_n = 512; + ngx_process = NGX_PROCESS_HELPER; + ngx_worker_process_init(cycle, 0); ngx_close_listening_sockets(cycle); diff --git a/src/os/unix/ngx_process_cycle.h b/src/os/unix/ngx_process_cycle.h index f46ad463f..e6cef6b3f 100644 --- a/src/os/unix/ngx_process_cycle.h +++ b/src/os/unix/ngx_process_cycle.h @@ -21,8 +21,9 @@ #define NGX_PROCESS_SINGLE 0 #define NGX_PROCESS_MASTER 1 -#define NGX_PROCESS_WORKER 2 -#define NGX_PROCESS_SIGNALLER 3 +#define NGX_PROCESS_SIGNALLER 2 +#define NGX_PROCESS_WORKER 3 +#define NGX_PROCESS_HELPER 4 typedef struct { |