Mercurial > hg > nginx

comparison src/core/ngx_log.c @ 445:f26432a1935a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx-0.1.0-2004-09-30-10:38:49 import
author Igor Sysoev <igor@sysoev.ru>
date Thu, 30 Sep 2004 06:38:49 +0000
parents 42d11f017717
children 241dc8092a33
comparison
equal deleted inserted replaced
444:42d11f017717 445:f26432a1935a
251 ngx_stderr.fd = STDERR_FILENO; 251 ngx_stderr.fd = STDERR_FILENO;
252 252
253 #endif 253 #endif
254 254
255 ngx_log.file = &ngx_stderr; 255 ngx_log.file = &ngx_stderr;
256
257 #ifdef NGX_ERROR_LOG_PATH
258
256 ngx_log.log_level = NGX_LOG_ERR; 259 ngx_log.log_level = NGX_LOG_ERR;
257
258 #ifdef NGX_ERROR_LOG_PATH
259 260
260 fd = ngx_open_file(NGX_ERROR_LOG_PATH, NGX_FILE_RDWR, 261 fd = ngx_open_file(NGX_ERROR_LOG_PATH, NGX_FILE_RDWR,
261 NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND); 262 NGX_FILE_CREATE_OR_OPEN|NGX_FILE_APPEND);
262 263
263 if (fd == NGX_INVALID_FILE) { 264 if (fd == NGX_INVALID_FILE) {
282 "dup2(STDERR) failed"); 283 "dup2(STDERR) failed");
283 return NULL; 284 return NULL;
284 } 285 }
285 286
286 #endif 287 #endif
288
289 #else
290
291 ngx_log.log_level = NGX_LOG_INFO;
287 292
288 #endif 293 #endif
289 294
290 return &ngx_log; 295 return &ngx_log;
291 } 296 }
373 { 378 {
374 ngx_str_t *value; 379 ngx_str_t *value;
375 380
376 value = cf->args->elts; 381 value = cf->args->elts;
377 382
378 cf->cycle->new_log->file->name = value[1]; 383 if (value[1].len == 6 && ngx_strcmp(value[1].data, "stderr") == 0) {
379 384 cf->cycle->new_log->file->fd = ngx_stderr.fd;
380 if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name) 385 cf->cycle->new_log->file->name.len = 0;
386 cf->cycle->new_log->file->name.data = NULL;
387
388 } else {
389 cf->cycle->new_log->file->name = value[1];
390
391 if (ngx_conf_full_name(cf->cycle, &cf->cycle->new_log->file->name)
381 == NGX_ERROR) 392 == NGX_ERROR)
382 { 393 {
383 return NGX_CONF_ERROR; 394 return NGX_CONF_ERROR;
395 }
384 } 396 }
385 397
386 return ngx_set_error_log_levels(cf, cf->cycle->new_log); 398 return ngx_set_error_log_levels(cf, cf->cycle->new_log);
387 } 399 }