comparison src/core/ngx_log.h @ 48:6cfc63e68377 NGINX_0_1_24

nginx 0.1.24 *) Feature: the ngx_http_ssi_filter_module supports the QUERY_STRING and DOCUMENT_URI variables. *) Bugfix: the ngx_http_autoindex_module may some times return the 404 response for existent directory, if this directory was used in "alias" directive. *) Bugfix: the ngx_http_ssi_filter_module ran incorrectly for large responses. *) Bugfix: the lack of the "Referer" header line was always accounted as valid referrer.
author Igor Sysoev <http://sysoev.ru>
date Fri, 04 Mar 2005 00:00:00 +0300
parents 4989c3d25945
children 0d75d65c642f
comparison
equal deleted inserted replaced
47:4ae32548452c 48:6cfc63e68377
70 #if (NGX_HAVE_GCC_VARIADIC_MACROS) 70 #if (NGX_HAVE_GCC_VARIADIC_MACROS)
71 71
72 #define NGX_HAVE_VARIADIC_MACROS 1 72 #define NGX_HAVE_VARIADIC_MACROS 1
73 73
74 #define ngx_log_error(level, log, args...) \ 74 #define ngx_log_error(level, log, args...) \
75 if (log->log_level >= level) ngx_log_error_core(level, log, args) 75 if (log->log_level >= level) ngx_log_error_core(level, log, args)
76 76
77 void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, 77 void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
78 const char *fmt, ...); 78 const char *fmt, ...);
79 79
80 #define ngx_log_debug(level, log, args...) \ 80 #define ngx_log_debug(level, log, args...) \
81 if (log->log_level & level) \ 81 if (log->log_level & level) \
82 ngx_log_error_core(NGX_LOG_DEBUG, log, args) 82 ngx_log_error_core(NGX_LOG_DEBUG, log, args)
83 83
86 #elif (NGX_HAVE_C99_VARIADIC_MACROS) 86 #elif (NGX_HAVE_C99_VARIADIC_MACROS)
87 87
88 #define NGX_HAVE_VARIADIC_MACROS 1 88 #define NGX_HAVE_VARIADIC_MACROS 1
89 89
90 #define ngx_log_error(level, log, ...) \ 90 #define ngx_log_error(level, log, ...) \
91 if (log->log_level >= level) ngx_log_error_core(level, log, __VA_ARGS__) 91 if (log->log_level >= level) ngx_log_error_core(level, log, __VA_ARGS__)
92 92
93 void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, 93 void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
94 const char *fmt, ...); 94 const char *fmt, ...);
95 95
96 #define ngx_log_debug(level, log, ...) \ 96 #define ngx_log_debug(level, log, ...) \
97 if (log->log_level & level) \ 97 if (log->log_level & level) \
98 ngx_log_error_core(NGX_LOG_DEBUG, log, __VA_ARGS__) 98 ngx_log_error_core(NGX_LOG_DEBUG, log, __VA_ARGS__)
99 99
102 #else /* NO VARIADIC MACROS */ 102 #else /* NO VARIADIC MACROS */
103 103
104 #define NGX_HAVE_VARIADIC_MACROS 0 104 #define NGX_HAVE_VARIADIC_MACROS 0
105 105
106 void ngx_log_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, 106 void ngx_log_error(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
107 const char *fmt, ...); 107 const char *fmt, ...);
108 void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err, 108 void ngx_log_error_core(ngx_uint_t level, ngx_log_t *log, ngx_err_t err,
109 const char *fmt, va_list args); 109 const char *fmt, va_list args);
110 void ngx_log_debug_core(ngx_log_t *log, ngx_err_t err, const char *fmt, ...); 110 void ngx_log_debug_core(ngx_log_t *log, ngx_err_t err, const char *fmt, ...);
111 111
112 112
113 #endif /* VARIADIC MACROS */ 113 #endif /* VARIADIC MACROS */
114 114
193 /*********************************/ 193 /*********************************/
194 194
195 #define ngx_log_alloc_log(pool, log) ngx_palloc(pool, log, sizeof(ngx_log_t)) 195 #define ngx_log_alloc_log(pool, log) ngx_palloc(pool, log, sizeof(ngx_log_t))
196 #define ngx_log_copy_log(new, old) ngx_memcpy(new, old, sizeof(ngx_log_t)) 196 #define ngx_log_copy_log(new, old) ngx_memcpy(new, old, sizeof(ngx_log_t))
197 197
198 ngx_log_t *ngx_log_init(); 198 ngx_log_t *ngx_log_init(void);
199 ngx_log_t *ngx_log_create_errlog(ngx_cycle_t *cycle, ngx_array_t *args); 199 ngx_log_t *ngx_log_create_errlog(ngx_cycle_t *cycle, ngx_array_t *args);
200 char *ngx_set_error_log_levels(ngx_conf_t *cf, ngx_log_t *log); 200 char *ngx_set_error_log_levels(ngx_conf_t *cf, ngx_log_t *log);
201 201
202 202
203
204 extern ngx_module_t ngx_errlog_module; 203 extern ngx_module_t ngx_errlog_module;
205 204
206 205
207 #endif /* _NGX_LOG_H_INCLUDED_ */ 206 #endif /* _NGX_LOG_H_INCLUDED_ */