Mercurial > hg > nginx-ranges
diff src/core/ngx_log.c @ 635:e67b227c8dbb default tip
Merge with current.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Mon, 25 Apr 2011 04:07:55 +0400 |
parents | 8214eaef3530 |
children |
line wrap: on
line diff
--- a/src/core/ngx_log.c +++ b/src/core/ngx_log.c @@ -148,9 +148,9 @@ ngx_log_error_core(ngx_uint_t level, ngx return; } - msg -= (err_levels[level].len + 4); + msg -= (7 + err_levels[level].len + 3); - (void) ngx_sprintf(msg, "[%V]: ", &err_levels[level]); + (void) ngx_sprintf(msg, "nginx: [%V] ", &err_levels[level]); (void) ngx_write_console(ngx_stderr, msg, p - msg); } @@ -209,9 +209,12 @@ ngx_log_stderr(ngx_err_t err, const char u_char errstr[NGX_MAX_ERROR_STR]; last = errstr + NGX_MAX_ERROR_STR; + p = errstr + 7; + + ngx_memcpy(errstr, "nginx: ", 7); va_start(args, fmt); - p = ngx_vslprintf(errstr, last, fmt, args); + p = ngx_vslprintf(p, last, fmt, args); va_end(args); if (err) { @@ -248,7 +251,7 @@ ngx_log_errno(u_char *buf, u_char *last, buf = ngx_slprintf(buf, last, " (%d: ", err); #endif - buf = ngx_strerror_r(err, buf, last - buf); + buf = ngx_strerror(err, buf, last - buf); if (buf < last) { *buf++ = ')'; @@ -325,7 +328,7 @@ ngx_log_init(u_char *prefix) if (ngx_log_file.fd == NGX_INVALID_FILE) { ngx_log_stderr(ngx_errno, - "[alert]: could not open error log file: " + "[alert] could not open error log file: " ngx_open_file_n " \"%s\" failed", name); #if (NGX_WIN32) ngx_event_log(ngx_errno, @@ -429,8 +432,7 @@ ngx_error_log(ngx_conf_t *cf, ngx_comman value = cf->args->elts; if (ngx_strcmp(value[1].data, "stderr") == 0) { - name.len = 0; - name.data = NULL; + ngx_str_null(&name); } else { name = value[1];