Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nginx/nginx.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/nginx.c')
-rw-r--r--src/core/nginx.c16
1 files changed, 4 insertions, 12 deletions
diff --git a/src/core/nginx.c b/src/core/nginx.c
index 236a65b0f..0f37f2ad8 100644
--- a/src/core/nginx.c
+++ b/src/core/nginx.c
@@ -1,6 +1,6 @@
/*
- * Copyright (C) 2002-2004 Igor Sysoev
+ * Copyright (C) Igor Sysoev
*/
@@ -95,8 +95,6 @@ ngx_module_t ngx_core_module = {
ngx_uint_t ngx_max_module;
-ngx_uint_t ngx_use_stderr;
-
int main(int argc, char *const *argv)
{
@@ -120,7 +118,9 @@ int main(int argc, char *const *argv)
ngx_pid = ngx_getpid();
- log = ngx_log_init_errlog();
+ if (!(log = ngx_log_init_errlog())) {
+ return 1;
+ }
#if (NGX_OPENSSL)
ngx_ssl_init(log);
@@ -144,10 +144,6 @@ int main(int argc, char *const *argv)
return 1;
}
- if (ngx_use_stderr) {
- log = ngx_log_init_errlog();
- }
-
if (ngx_os_init(log) == NGX_ERROR) {
return 1;
}
@@ -326,10 +322,6 @@ static ngx_int_t ngx_getopt(ngx_master_ctx_t *ctx, ngx_cycle_t *cycle)
ngx_test_config = 1;
break;
- case 's':
- ngx_use_stderr = 1;
- break;
-
case 'c':
if (ctx->argv[i + 1] == NULL) {
ngx_log_error(NGX_LOG_EMERG, cycle->log, 0,