Mercurial > hg > nginx
comparison src/core/ngx_log.c @ 415:3c56e834be46
nginx-0.0.10-2004-09-05-23:54:02 import
author | Igor Sysoev <igor@sysoev.ru> |
---|---|
date | Sun, 05 Sep 2004 19:54:02 +0000 |
parents | 73688d5d7fc3 |
children | 0526206251f6 |
comparison
equal
deleted
inserted
replaced
414:388a842cbbe1 | 415:3c56e834be46 |
---|---|
35 NULL, /* init module */ | 35 NULL, /* init module */ |
36 NULL /* init child */ | 36 NULL /* init child */ |
37 }; | 37 }; |
38 | 38 |
39 | 39 |
40 static ngx_log_t ngx_log; | |
40 static ngx_open_file_t ngx_stderr; | 41 static ngx_open_file_t ngx_stderr; |
41 static ngx_log_t ngx_log; | |
42 | 42 |
43 | 43 |
44 static const char *err_levels[] = { | 44 static const char *err_levels[] = { |
45 "stderr", "emerg", "alert", "crit", "error", | 45 "stderr", "emerg", "alert", "crit", "error", |
46 "warn", "notice", "info", "debug" | 46 "warn", "notice", "info", "debug" |
294 | 294 |
295 } else { | 295 } else { |
296 name = NULL; | 296 name = NULL; |
297 } | 297 } |
298 | 298 |
299 ngx_test_null(log, ngx_pcalloc(cycle->pool, sizeof(ngx_log_t)), NULL); | 299 if (!(log = ngx_pcalloc(cycle->pool, sizeof(ngx_log_t)))) { |
300 ngx_test_null(log->file, ngx_conf_open_file(cycle, name), NULL); | 300 return NULL; |
301 } | |
302 | |
303 if (!(log->file = ngx_conf_open_file(cycle, name))) { | |
304 return NULL; | |
305 } | |
301 | 306 |
302 return log; | 307 return log; |
303 } | 308 } |
304 | 309 |
305 | 310 |
361 ngx_str_t *value; | 366 ngx_str_t *value; |
362 | 367 |
363 value = cf->args->elts; | 368 value = cf->args->elts; |
364 | 369 |
365 if (value[1].len == 6 && ngx_strcmp(value[1].data, "stderr") == 0) { | 370 if (value[1].len == 6 && ngx_strcmp(value[1].data, "stderr") == 0) { |
366 cf->cycle->new_log->file = &ngx_stderr; | 371 cf->cycle->new_log->file->fd = ngx_stderr.fd; |
372 cf->cycle->new_log->file->name.len = 0; | |
373 cf->cycle->new_log->file->name.data = NULL; | |
367 | 374 |
368 } else { | 375 } else { |
369 cf->cycle->new_log->file->name = value[1]; | 376 cf->cycle->new_log->file->name = value[1]; |
370 } | 377 } |
371 | 378 |