Mercurial > hg > nginx

comparison src/core/ngx_log.c @ 3799:188007bf58c3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add "nginx: " prefix when logging to the stderr
author Igor Sysoev <igor@sysoev.ru>
date Mon, 29 Nov 2010 15:01:06 +0000
parents e294f37401c0
children 75ffcfc700f3
comparison
equal deleted inserted replaced
3798:61d64ab739a0 3799:188007bf58c3
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 + 4);
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 }