Mercurial > hg > nginx-ranges
comparison 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 |
comparison
equal
deleted
inserted
replaced
578:f3a9e57d2e17 | 635:e67b227c8dbb |
---|---|
146 || log->file->fd == ngx_stderr) | 146 || log->file->fd == ngx_stderr) |
147 { | 147 { |
148 return; | 148 return; |
149 } | 149 } |
150 | 150 |
151 msg -= (err_levels[level].len + 4); | 151 msg -= (7 + err_levels[level].len + 3); |
152 | 152 |
153 (void) ngx_sprintf(msg, "[%V]: ", &err_levels[level]); | 153 (void) ngx_sprintf(msg, "nginx: [%V] ", &err_levels[level]); |
154 | 154 |
155 (void) ngx_write_console(ngx_stderr, msg, p - msg); | 155 (void) ngx_write_console(ngx_stderr, msg, p - msg); |
156 } | 156 } |
157 | 157 |
158 | 158 |
207 u_char *p, *last; | 207 u_char *p, *last; |
208 va_list args; | 208 va_list args; |
209 u_char errstr[NGX_MAX_ERROR_STR]; | 209 u_char errstr[NGX_MAX_ERROR_STR]; |
210 | 210 |
211 last = errstr + NGX_MAX_ERROR_STR; | 211 last = errstr + NGX_MAX_ERROR_STR; |
212 p = errstr + 7; | |
213 | |
214 ngx_memcpy(errstr, "nginx: ", 7); | |
212 | 215 |
213 va_start(args, fmt); | 216 va_start(args, fmt); |
214 p = ngx_vslprintf(errstr, last, fmt, args); | 217 p = ngx_vslprintf(p, last, fmt, args); |
215 va_end(args); | 218 va_end(args); |
216 | 219 |
217 if (err) { | 220 if (err) { |
218 p = ngx_log_errno(p, last, err); | 221 p = ngx_log_errno(p, last, err); |
219 } | 222 } |
246 ? " (%d: " : " (%Xd: ", err); | 249 ? " (%d: " : " (%Xd: ", err); |
247 #else | 250 #else |
248 buf = ngx_slprintf(buf, last, " (%d: ", err); | 251 buf = ngx_slprintf(buf, last, " (%d: ", err); |
249 #endif | 252 #endif |
250 | 253 |
251 buf = ngx_strerror_r(err, buf, last - buf); | 254 buf = ngx_strerror(err, buf, last - buf); |
252 | 255 |
253 if (buf < last) { | 256 if (buf < last) { |
254 *buf++ = ')'; | 257 *buf++ = ')'; |
255 } | 258 } |
256 | 259 |
323 NGX_FILE_CREATE_OR_OPEN, | 326 NGX_FILE_CREATE_OR_OPEN, |
324 NGX_FILE_DEFAULT_ACCESS); | 327 NGX_FILE_DEFAULT_ACCESS); |
325 | 328 |
326 if (ngx_log_file.fd == NGX_INVALID_FILE) { | 329 if (ngx_log_file.fd == NGX_INVALID_FILE) { |
327 ngx_log_stderr(ngx_errno, | 330 ngx_log_stderr(ngx_errno, |
328 "[alert]: could not open error log file: " | 331 "[alert] could not open error log file: " |
329 ngx_open_file_n " \"%s\" failed", name); | 332 ngx_open_file_n " \"%s\" failed", name); |
330 #if (NGX_WIN32) | 333 #if (NGX_WIN32) |
331 ngx_event_log(ngx_errno, | 334 ngx_event_log(ngx_errno, |
332 "could not open error log file: " | 335 "could not open error log file: " |
333 ngx_open_file_n " \"%s\" failed", name); | 336 ngx_open_file_n " \"%s\" failed", name); |
427 } | 430 } |
428 | 431 |
429 value = cf->args->elts; | 432 value = cf->args->elts; |
430 | 433 |
431 if (ngx_strcmp(value[1].data, "stderr") == 0) { | 434 if (ngx_strcmp(value[1].data, "stderr") == 0) { |
432 name.len = 0; | 435 ngx_str_null(&name); |
433 name.data = NULL; | |
434 | 436 |
435 } else { | 437 } else { |
436 name = value[1]; | 438 name = value[1]; |
437 } | 439 } |
438 | 440 |