aboutsummaryrefslogtreecommitdiff
path: root/src/core/nginx.c
diff options
context:
space:
mode:
authorIgor Sysoev <igor@sysoev.ru>2004-10-03 20:02:06 +0000
committerIgor Sysoev <igor@sysoev.ru>2004-10-03 20:02:06 +0000
commitaad1b89b68b0651b5729b15203081f6b4620847a (patch)
tree8a5906c3607c082e27d4d8ebc1e9a9e5b42822b5 /src/core/nginx.c
parent8035fd27919d1f598b0d655a3bf30200220462d3 (diff)
downloadnginx-aad1b89b68b0651b5729b15203081f6b4620847a.tar.gz
nginx-aad1b89b68b0651b5729b15203081f6b4620847a.zip
nginx-0.1.0-2004-10-04-00:02:06 import
Diffstat (limited to 'src/core/nginx.c')
-rw-r--r--src/core/nginx.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c
index a41c55cea..18f3cccb4 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -89,7 +89,7 @@ ngx_module_t ngx_core_module = {
ngx_core_commands, /* module directives */
NGX_CORE_MODULE, /* module type */
NULL, /* init module */
- NULL /* init child */
+ NULL /* init process */
};
@@ -146,10 +146,6 @@ int main(int argc, char *const *argv)
if (ngx_test_config) {
log->log_level = NGX_LOG_INFO;
- } else {
- if (ngx_log_init_error_log() == NGX_ERROR) {
- return 1;
- }
}
if (ngx_os_init(log) == NGX_ERROR) {
@@ -183,6 +179,8 @@ int main(int argc, char *const *argv)
return 0;
}
+ ngx_os_status(cycle->log);
+
ngx_cycle = cycle;
ccf = (ngx_core_conf_t *) ngx_get_conf(cycle->conf_ctx, ngx_core_module);