nginx-0.0.1-2002-08-26-19:18:19 import

1 files changed, 21 insertions, 21 deletions

diff --git a/src/core/ngx_log.c b/src/core/ngx_log.c
index 8429d90b1..bed628aed 100644
--- a/src/core/ngx_log.c
+++ b/src/core/ngx_log.c
@@ -37,39 +37,42 @@ void ngx_log_error_core(int level, ngx_log_t *log, ngx_err_t err,
 #endif
 
     ngx_localtime(&tm);
-    len = ngx_snprintf(errstr, sizeof(errstr), "%02d:%02d:%02d",
+    len = ngx_snprintf(errstr, sizeof(errstr), "%4d/%02d/%02d %02d:%02d:%02d",
+                       tm.ngx_tm_year + 1900, tm.ngx_tm_mon, tm.ngx_tm_mday,
                        tm.ngx_tm_hour, tm.ngx_tm_min, tm.ngx_tm_sec);
 
+    len += ngx_snprintf(errstr + len, sizeof(errstr) - len - 1,
+                        " [%s] ", err_levels[level]);
+
+    len += ngx_snprintf(errstr + len, sizeof(errstr) - len - 1,
+                        "%d#%d: ", getpid(), 0);
+
+#if (HAVE_VARIADIC_MACROS)
+    va_start(args, fmt);
+    len += ngx_vsnprintf(errstr + len, sizeof(errstr) - len - 1, fmt, args);
+    va_end(args);
+#else
+    len += ngx_vsnprintf(errstr + len, sizeof(errstr) - len - 1, fmt, args);
+#endif
+
     if (err) {
         if ((unsigned) err < 0x80000000)
             len += ngx_snprintf(errstr + len, sizeof(errstr) - len - 1,
-                            " [%s] (%d)",
-                            err_levels[level], err);
+                            " (%d: ", err);
         else
             len += ngx_snprintf(errstr + len, sizeof(errstr) - len - 1,
-                            " [%s] (%X)",
-                            err_levels[level], err);
+                            " (%X: ", err);
 
         len += ngx_strerror_r(err, errstr + len, sizeof(errstr) - len - 1);
         if (len < sizeof(errstr) - 2) {
-            errstr[len++] = ':';
-            errstr[len++] = ' ';
+            errstr[len++] = ')';
         } else {
             len = sizeof(errstr) - 2;
         }
-
-    } else {
-        len += ngx_snprintf(errstr + len, sizeof(errstr) - len - 1,
-                            " [%s] ", err_levels[level]);
     }
 
-#if (HAVE_VARIADIC_MACROS)
-    va_start(args, fmt);
-    len += ngx_vsnprintf(errstr + len, sizeof(errstr) - len - 1, fmt, args);
-    va_end(args);
-#else
-    len += ngx_vsnprintf(errstr + len, sizeof(errstr) - len - 1, fmt, args);
-#endif
+    if (level != NGX_LOG_DEBUG && log->handler)
+        len += log->handler(log->data, errstr + len, sizeof(errstr) - len - 1);
 
     if (len > sizeof(errstr) - 2)
         len = sizeof(errstr) - 2;
@@ -77,9 +80,6 @@ void ngx_log_error_core(int level, ngx_log_t *log, ngx_err_t err,
     errstr[len + 1] = '\0';
 
     fputs(errstr, stderr);
-
-    if (level == NGX_LOG_EMERG)
-        exit(1);
 }
 
 #if !(HAVE_VARIADIC_MACROS)