Mercurial > hg > nginx
diff src/os/unix/ngx_process_cycle.c @ 310:a9a9af2c7370
nginx-0.0.3-2004-04-12-10:10:53 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Mon, 12 Apr 2004 06:10:53 +0000 |
parents | 2e899477243a |
children | 11ff50a35d6d |
line wrap: on
line diff
--- a/src/os/unix/ngx_process_cycle.c Fri Apr 09 16:03:04 2004 +0000 +++ b/src/os/unix/ngx_process_cycle.c Mon Apr 12 06:10:53 2004 +0000 @@ -12,6 +12,8 @@ static int ngx_worker_thread_cycle(void *data); #endif +static void ngx_delete_pidfile(ngx_cycle_t *cycle); + ngx_int_t ngx_process; ngx_pid_t ngx_pid; @@ -336,21 +338,10 @@ static void ngx_master_exit(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx) { - u_char *name; - - if (ngx_inherited && getppid() > 1) { - name = ctx->pid.name.data; - - } else { - name = ctx->name; - } - - if (ngx_delete_file(name) == NGX_FILE_ERROR) { - ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, - ngx_delete_file_n " \"%s\" failed", name); - } + ngx_delete_pidfile(cycle); ngx_log_error(NGX_LOG_INFO, cycle->log, 0, "exit"); + exit(0); } @@ -535,31 +526,44 @@ #endif -static ngx_int_t ngx_create_pid_file(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx) +static ngx_int_t ngx_create_pidfile(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx) { size_t len; u_char pid[NGX_INT64_LEN + 1]; + ngx_str_t name; ngx_core_conf_t *ccf; ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); + if (ctx->pid.len) { + if (ccf->pid.len == 0) { + return NGX_OK; + } + + if (ctx->pid.len == ccf->pid.len + && ngx_strcmp(ctx->pid.data, ccf->pid.data) == 0) + { + return NGX_OK; + } + } + if (ccf->pid.len == 0) { ccf->pid.len = sizeof(NGINX_PID) - 1; ccf->pid.data = NGINX_PID; - ccf->newpid.len = sizeof(NGINX_NEW_PID) - 1; - ccf->newpid.data = NGINX_NEW_PID; + ccf->newpid.len = sizeof(NGINX_NEWPID) - 1; + ccf->newpid.data = NGINX_NEWPID; } else { - ccf->newpid.len = ccf->pid.len + sizeof(NGINX_NEW_PID_EXT); + ccf->newpid.len = ccf->pid.len + sizeof(NGINX_NEWPID_EXT); if (!(ccf->newpid.data = ngx_alloc(ccf->newpid.len, cycle->log))) { return NGX_ERROR; } ngx_memcpy(ngx_cpymem(ccf->newpid.data, ccf->pid.data, ccf->pid.len), - NGINX_NEW_PID_EXT, sizeof(NGINX_NEW_PID_EXT)); + NGINX_NEWPID_EXT, sizeof(NGINX_NEWPID_EXT)); } - len = ngx_snprintf((char *) pid, /* STUB */ 10, PID_T_FMT, ngx_getpid()); + len = ngx_snprintf((char *) pid, NGX_INT64_LEN + 1, PID_T_FMT, ngx_pid); ngx_memzero(&ctx->pid, sizeof(ngx_file_t)); ctx->pid.name = ngx_inherited ? ccf->newpid : ccf->pid; ctx->name = ccf->pid.data; @@ -584,3 +588,24 @@ return NGX_OK; } + + +static void ngx_delete_pidfile(ngx_cycle_t *cycle) +{ + u_char *name; + ngx_core_conf_t *ccf; + + ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module); + + if (ngx_inherited && getppid() > 1) { + name = ccf->newpid.data; + + } else { + name = ccf->pid.data; + } + + if (ngx_delete_file(name) == NGX_FILE_ERROR) { + ngx_log_error(NGX_LOG_ALERT, cycle->log, ngx_errno, + ngx_delete_file_n " \"%s\" failed", name); + } +}