mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.1-2004-01-21-19:38:54 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-01-21 16:38:54 +00:00
parent 03420a621a
commit 2f2491b5ea
1 changed files with 62 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
src/core/ngx_log.c
View File

@ -3,6 +3,7 @@
#include <ngx_core.h> #include <ngx_core.h>
ngx_inline static int ngx_log_is_full(ngx_log_t *log, char *errstr, size_t len);
static char *ngx_set_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf); static char *ngx_set_error_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf);
@ -97,6 +98,14 @@ void ngx_log_error_core(int level, ngx_log_t *log, ngx_err_t err,
if (err) { if (err) {
if (len > sizeof(errstr) - 50) {
/* leave a space for an error code */
len = sizeof(errstr) - 50;
errstr[len++] = '.';
errstr[len++] = '.';
errstr[len++] = '.';
}
#if (WIN32) #if (WIN32)
if ((unsigned) err >= 0x80000000) { if ((unsigned) err >= 0x80000000) {
len += ngx_snprintf(errstr + len, sizeof(errstr) - len - 1, len += ngx_snprintf(errstr + len, sizeof(errstr) - len - 1,
@ -110,20 +119,34 @@ void ngx_log_error_core(int level, ngx_log_t *log, ngx_err_t err,
" (%d: ", err); " (%d: ", err);
#endif #endif
if (ngx_log_is_full(log, errstr, len)) {
return;
}
len += ngx_strerror_r(err, errstr + len, sizeof(errstr) - len - 1); len += ngx_strerror_r(err, errstr + len, sizeof(errstr) - len - 1);
if (len < sizeof(errstr) - 2) {
errstr[len++] = ')'; if (ngx_log_is_full(log, errstr, len)) {
} else { return;
len = sizeof(errstr) - 2; }
errstr[len++] = ')';
if (ngx_log_is_full(log, errstr, len)) {
return;
}
} else {
if (ngx_log_is_full(log, errstr, len)) {
return;
} }
} }
if (level != NGX_LOG_DEBUG && log->handler) { if (level != NGX_LOG_DEBUG && log->handler) {
len += log->handler(log->data, errstr + len, sizeof(errstr) - len - 1); len += log->handler(log->data, errstr + len, sizeof(errstr) - len - 1);
}
if (len > sizeof(errstr) - 2) { if (ngx_log_is_full(log, errstr, len)) {
len = sizeof(errstr) - 2; return;
}
} }
#if (WIN32) #if (WIN32)
@ -141,6 +164,38 @@ void ngx_log_error_core(int level, ngx_log_t *log, ngx_err_t err,
} }
ngx_inline static int ngx_log_is_full(ngx_log_t *log, char *errstr, size_t len)
{
#if (WIN32)
u_long written;
if (len > MAX_ERROR_STR - 2) {
len = MAX_ERROR_STR - 2;
errstr[len++] = CR;
errstr[len++] = LF;
WriteFile(log->file->fd, errstr, len, &written, NULL);
return 1;
}
#else
if (len > MAX_ERROR_STR - 1) {
len = MAX_ERROR_STR - 1;
errstr[len++] = LF;
write(log->file->fd, errstr, len);
return 1;
}
#endif
return 0;
}
#if !(HAVE_VARIADIC_MACROS) #if !(HAVE_VARIADIC_MACROS)
void ngx_log_error(int level, ngx_log_t *log, ngx_err_t err, void ngx_log_error(int level, ngx_log_t *log, ngx_err_t err,