commit ff8da91784ae67ef3b5daa6ebbbbef2ec728729f
author Igor Sysoev <igor@sysoev.ru> Wed Sep 29 16:00:49 2004 +0000
committer Igor Sysoev <igor@sysoev.ru> Wed Sep 29 16:00:49 2004 +0000
tree 66ca5a267c5768598f12e4bc727e5eced7c3c453
parent 55168f6b6bca2d9aafc11ada25b514f7ac99d34f

nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright

src/core/nginx.c

diff --git a/src/core/nginx.c b/src/core/nginx.c
index 236a65b..0f37f2a 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_uint_t  ngx_max_module;
 
-ngx_uint_t  ngx_use_stderr;
-
 
 int main(int argc, char *const *argv)
 {
@@ -120,7 +118,9 @@
 
     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 @@
         return 1;
     }
 
-    if (ngx_use_stderr) {
-        log = ngx_log_init_errlog();
-    }
-
     if (ngx_os_init(log) == NGX_ERROR) {
         return 1;
     }
@@ -326,10 +322,6 @@
             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,