Mercurial > hg > nginx
annotate src/http/modules/ngx_http_log_module.c @ 2536:a6d6d762c554
small optimization: " == NGX_ERROR" > " != NGX_OK"
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Tue, 24 Feb 2009 10:42:23 +0000 |
| parents | 732bf367dc08 |
| children | 09cab3f8d92e |
| rev | line source |
|---|---|
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
1 |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
2 /* |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
4 */ |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
5 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
6 |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 #include <ngx_config.h> |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 #include <ngx_core.h> |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 #include <ngx_http.h> |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
10 |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 |
| 880 | 12 typedef struct ngx_http_log_op_s ngx_http_log_op_t; |
| 13 | |
| 14 typedef u_char *(*ngx_http_log_op_run_pt) (ngx_http_request_t *r, u_char *buf, | |
| 15 ngx_http_log_op_t *op); | |
| 16 | |
| 17 typedef size_t (*ngx_http_log_op_getlen_pt) (ngx_http_request_t *r, | |
| 18 uintptr_t data); | |
| 19 | |
| 20 | |
| 21 struct ngx_http_log_op_s { | |
| 22 size_t len; | |
| 23 ngx_http_log_op_getlen_pt getlen; | |
| 24 ngx_http_log_op_run_pt run; | |
| 25 uintptr_t data; | |
| 26 }; | |
| 27 | |
| 573 | 28 |
| 29 typedef struct { | |
| 30 ngx_str_t name; | |
| 2261 | 31 ngx_array_t *flushes; |
| 573 | 32 ngx_array_t *ops; /* array of ngx_http_log_op_t */ |
| 33 } ngx_http_log_fmt_t; | |
| 34 | |
| 657 | 35 |
| 573 | 36 typedef struct { |
| 37 ngx_array_t formats; /* array of ngx_http_log_fmt_t */ | |
| 38 ngx_uint_t combined_used; /* unsigned combined_used:1 */ | |
| 39 } ngx_http_log_main_conf_t; | |
| 40 | |
| 657 | 41 |
| 573 | 42 typedef struct { |
| 2072 | 43 ngx_array_t *lengths; |
| 44 ngx_array_t *values; | |
| 45 } ngx_http_log_script_t; | |
| 46 | |
| 47 | |
| 48 typedef struct { | |
| 573 | 49 ngx_open_file_t *file; |
| 2072 | 50 ngx_http_log_script_t *script; |
| 633 | 51 time_t disk_full_time; |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
52 time_t error_log_time; |
| 2261 | 53 ngx_http_log_fmt_t *format; |
| 573 | 54 } ngx_http_log_t; |
| 55 | |
| 657 | 56 |
| 573 | 57 typedef struct { |
| 58 ngx_array_t *logs; /* array of ngx_http_log_t */ | |
| 2072 | 59 |
| 60 ngx_open_file_cache_t *open_file_cache; | |
| 61 time_t open_file_cache_valid; | |
| 62 ngx_uint_t open_file_cache_min_uses; | |
| 63 | |
| 573 | 64 ngx_uint_t off; /* unsigned off:1 */ |
| 65 } ngx_http_log_loc_conf_t; | |
| 66 | |
| 67 | |
| 68 typedef struct { | |
| 69 ngx_str_t name; | |
| 70 size_t len; | |
| 71 ngx_http_log_op_run_pt run; | |
| 72 } ngx_http_log_var_t; | |
| 73 | |
| 74 | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
75 static void ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log, |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
76 u_char *buf, size_t len); |
| 2072 | 77 static ssize_t ngx_http_log_script_write(ngx_http_request_t *r, |
| 78 ngx_http_log_script_t *script, u_char **name, u_char *buf, size_t len); | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
79 |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
80 static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf, |
| 497 | 81 ngx_http_log_op_t *op); |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
82 static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf, |
| 497 | 83 ngx_http_log_op_t *op); |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
84 static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf, |
| 497 | 85 ngx_http_log_op_t *op); |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
86 static u_char *ngx_http_log_msec(ngx_http_request_t *r, u_char *buf, |
| 497 | 87 ngx_http_log_op_t *op); |
| 88 static u_char *ngx_http_log_request_time(ngx_http_request_t *r, u_char *buf, | |
| 89 ngx_http_log_op_t *op); | |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
90 static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf, |
| 497 | 91 ngx_http_log_op_t *op); |
| 573 | 92 static u_char *ngx_http_log_bytes_sent(ngx_http_request_t *r, u_char *buf, |
| 497 | 93 ngx_http_log_op_t *op); |
| 577 | 94 static u_char *ngx_http_log_body_bytes_sent(ngx_http_request_t *r, |
| 573 | 95 u_char *buf, ngx_http_log_op_t *op); |
| 475 | 96 static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf, |
| 497 | 97 ngx_http_log_op_t *op); |
| 479 | 98 |
| 501 | 99 static ngx_int_t ngx_http_log_variable_compile(ngx_conf_t *cf, |
| 100 ngx_http_log_op_t *op, ngx_str_t *value); | |
| 101 static size_t ngx_http_log_variable_getlen(ngx_http_request_t *r, | |
| 102 uintptr_t data); | |
| 103 static u_char *ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, | |
| 104 ngx_http_log_op_t *op); | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
105 static uintptr_t ngx_http_log_escape(u_char *dst, u_char *src, size_t size); |
| 501 | 106 |
| 107 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
108 static void *ngx_http_log_create_main_conf(ngx_conf_t *cf); |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
109 static void *ngx_http_log_create_loc_conf(ngx_conf_t *cf); |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
110 static char *ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, |
| 497 | 111 void *child); |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
112 static char *ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, |
| 497 | 113 void *conf); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
114 static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, |
| 497 | 115 void *conf); |
| 573 | 116 static char *ngx_http_log_compile_format(ngx_conf_t *cf, |
| 2261 | 117 ngx_array_t *flushes, ngx_array_t *ops, ngx_array_t *args, ngx_uint_t s); |
| 2072 | 118 static char *ngx_http_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, |
| 119 void *conf); | |
| 573 | 120 static ngx_int_t ngx_http_log_init(ngx_conf_t *cf); |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
121 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
122 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
123 static ngx_command_t ngx_http_log_commands[] = { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
124 |
| 497 | 125 { ngx_string("log_format"), |
| 126 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE, | |
| 127 ngx_http_log_set_format, | |
| 128 NGX_HTTP_MAIN_CONF_OFFSET, | |
| 129 0, | |
| 130 NULL }, | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
131 |
| 497 | 132 { ngx_string("access_log"), |
| 645 | 133 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_HTTP_LIF_CONF |
|
1562
bb662e047a21
allow access_log inside limit_except
Igor Sysoev <igor@sysoev.ru>
parents:
1271
diff
changeset
|
134 |NGX_HTTP_LMT_CONF|NGX_CONF_TAKE123, |
| 497 | 135 ngx_http_log_set_log, |
| 136 NGX_HTTP_LOC_CONF_OFFSET, | |
| 137 0, | |
| 138 NULL }, | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
139 |
| 2072 | 140 { ngx_string("open_log_file_cache"), |
| 141 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_TAKE1234, | |
| 142 ngx_http_log_open_file_cache, | |
| 143 NGX_HTTP_LOC_CONF_OFFSET, | |
| 144 0, | |
| 145 NULL }, | |
| 146 | |
| 497 | 147 ngx_null_command |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
148 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
149 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
150 |
| 667 | 151 static ngx_http_module_t ngx_http_log_module_ctx = { |
| 880 | 152 NULL, /* preconfiguration */ |
| 573 | 153 ngx_http_log_init, /* postconfiguration */ |
|
177
4db54fdbcbe7
nginx-0.0.1-2003-11-10-20:17:31 import
Igor Sysoev <igor@sysoev.ru>
parents:
176
diff
changeset
|
154 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
155 ngx_http_log_create_main_conf, /* create main configuration */ |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
156 NULL, /* init main configuration */ |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
157 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
158 NULL, /* create server configuration */ |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
159 NULL, /* merge server configuration */ |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
160 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
161 ngx_http_log_create_loc_conf, /* create location configration */ |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
162 ngx_http_log_merge_loc_conf /* merge location configration */ |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
163 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
164 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
165 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
166 ngx_module_t ngx_http_log_module = { |
| 509 | 167 NGX_MODULE_V1, |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
168 &ngx_http_log_module_ctx, /* module context */ |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
169 ngx_http_log_commands, /* module directives */ |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
170 NGX_HTTP_MODULE, /* module type */ |
| 541 | 171 NULL, /* init master */ |
| 573 | 172 NULL, /* init module */ |
| 541 | 173 NULL, /* init process */ |
| 174 NULL, /* init thread */ | |
| 175 NULL, /* exit thread */ | |
| 176 NULL, /* exit process */ | |
| 177 NULL, /* exit master */ | |
| 178 NGX_MODULE_V1_PADDING | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
179 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
180 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
181 |
| 1074 | 182 static ngx_str_t ngx_http_access_log = ngx_string(NGX_HTTP_LOG_PATH); |
| 573 | 183 |
| 184 | |
| 185 static ngx_str_t ngx_http_combined_fmt = | |
| 581 | 186 ngx_string("$remote_addr - $remote_user [$time_local] " |
| 577 | 187 "\"$request\" $status $body_bytes_sent " |
| 573 | 188 "\"$http_referer\" \"$http_user_agent\""); |
|
119
cd54bcbaf3b5
nginx-0.0.1-2003-07-21-01:15:59 import
Igor Sysoev <igor@sysoev.ru>
parents:
116
diff
changeset
|
189 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
190 |
| 573 | 191 static ngx_http_log_var_t ngx_http_log_vars[] = { |
| 192 { ngx_string("connection"), NGX_ATOMIC_T_LEN, ngx_http_log_connection }, | |
| 193 { ngx_string("pipe"), 1, ngx_http_log_pipe }, | |
| 581 | 194 { ngx_string("time_local"), sizeof("28/Sep/1970:12:00:00 +0600") - 1, |
| 573 | 195 ngx_http_log_time }, |
| 196 { ngx_string("msec"), NGX_TIME_T_LEN + 4, ngx_http_log_msec }, | |
|
1179
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
197 { ngx_string("request_time"), NGX_TIME_T_LEN + 4, |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
198 ngx_http_log_request_time }, |
| 573 | 199 { ngx_string("status"), 3, ngx_http_log_status }, |
| 200 { ngx_string("bytes_sent"), NGX_OFF_T_LEN, ngx_http_log_bytes_sent }, | |
| 577 | 201 { ngx_string("body_bytes_sent"), NGX_OFF_T_LEN, |
| 202 ngx_http_log_body_bytes_sent }, | |
| 573 | 203 { ngx_string("apache_bytes_sent"), NGX_OFF_T_LEN, |
| 577 | 204 ngx_http_log_body_bytes_sent }, |
| 573 | 205 { ngx_string("request_length"), NGX_SIZE_T_LEN, |
| 206 ngx_http_log_request_length }, | |
| 207 | |
| 208 { ngx_null_string, 0, NULL } | |
| 209 }; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
210 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
211 |
| 497 | 212 ngx_int_t |
| 213 ngx_http_log_handler(ngx_http_request_t *r) | |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
214 { |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
215 u_char *line, *p; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
216 size_t len; |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
217 ngx_uint_t i, l; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
218 ngx_http_log_t *log; |
| 571 | 219 ngx_open_file_t *file; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
220 ngx_http_log_op_t *op; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
221 ngx_http_log_loc_conf_t *lcf; |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
222 |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
223 ngx_log_debug0(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
224 "http log handler"); |
|
28
a117a7fdf042
nginx-0.0.1-2002-12-16-00:08:04 import
Igor Sysoev <igor@sysoev.ru>
parents:
26
diff
changeset
|
225 |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
226 lcf = ngx_http_get_module_loc_conf(r, ngx_http_log_module); |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
227 |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
228 if (lcf->off) { |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
229 return NGX_OK; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
230 } |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
231 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
232 log = lcf->logs->elts; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
233 for (l = 0; l < lcf->logs->nelts; l++) { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
234 |
| 633 | 235 if (ngx_time() == log[l].disk_full_time) { |
| 236 | |
| 237 /* | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
238 * on FreeBSD writing to a full filesystem with enabled softupdates |
| 633 | 239 * may block process for much longer time than writing to non-full |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
240 * filesystem, so we skip writing to a log for one second |
| 633 | 241 */ |
| 242 | |
| 243 continue; | |
| 244 } | |
| 245 | |
| 2261 | 246 ngx_http_script_flush_no_cacheable_variables(r, log[l].format->flushes); |
| 247 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
248 len = 0; |
| 2261 | 249 op = log[l].format->ops->elts; |
| 250 for (i = 0; i < log[l].format->ops->nelts; i++) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
251 if (op[i].len == 0) { |
| 479 | 252 len += op[i].getlen(r, op[i].data); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
253 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
254 } else { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
255 len += op[i].len; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
256 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
257 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
258 |
| 571 | 259 len += NGX_LINEFEED_SIZE; |
| 260 | |
| 261 file = log[l].file; | |
| 262 | |
| 2072 | 263 if (file && file->buffer) { |
| 571 | 264 |
| 265 if (len > (size_t) (file->last - file->pos)) { | |
| 266 | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
267 ngx_http_log_write(r, &log[l], file->buffer, |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
268 file->pos - file->buffer); |
| 571 | 269 |
| 270 file->pos = file->buffer; | |
| 271 } | |
| 272 | |
| 273 if (len <= (size_t) (file->last - file->pos)) { | |
| 274 | |
| 275 p = file->pos; | |
| 276 | |
| 2261 | 277 for (i = 0; i < log[l].format->ops->nelts; i++) { |
| 571 | 278 p = op[i].run(r, p, &op[i]); |
| 279 } | |
| 280 | |
| 281 ngx_linefeed(p); | |
| 282 | |
| 283 file->pos = p; | |
| 284 | |
| 285 continue; | |
| 286 } | |
| 287 } | |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
288 |
| 2049 | 289 line = ngx_pnalloc(r->pool, len); |
| 501 | 290 if (line == NULL) { |
| 473 | 291 return NGX_ERROR; |
| 292 } | |
| 293 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
294 p = line; |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
295 |
| 2261 | 296 for (i = 0; i < log[l].format->ops->nelts; i++) { |
| 479 | 297 p = op[i].run(r, p, &op[i]); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
298 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
299 |
| 571 | 300 ngx_linefeed(p); |
| 301 | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
302 ngx_http_log_write(r, &log[l], line, p - line); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
303 } |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
304 |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
305 return NGX_OK; |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
306 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
307 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
308 |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
309 static void |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
310 ngx_http_log_write(ngx_http_request_t *r, ngx_http_log_t *log, u_char *buf, |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
311 size_t len) |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
312 { |
| 2072 | 313 u_char *name; |
| 314 time_t now; | |
| 315 ssize_t n; | |
| 316 ngx_err_t err; | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
317 |
| 2072 | 318 if (log->script == NULL) { |
| 319 name = log->file->name.data; | |
| 320 n = ngx_write_fd(log->file->fd, buf, len); | |
| 321 | |
| 322 } else { | |
| 323 name = NULL; | |
| 324 n = ngx_http_log_script_write(r, log->script, &name, buf, len); | |
| 325 } | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
326 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
327 if (n == (ssize_t) len) { |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
328 return; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
329 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
330 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
331 now = ngx_time(); |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
332 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
333 if (n == -1) { |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
334 err = ngx_errno; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
335 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
336 if (err == NGX_ENOSPC) { |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
337 log->disk_full_time = now; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
338 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
339 |
|
1161
6002e0253221
use 60 seconds interval but not 61 seconds
Igor Sysoev <igor@sysoev.ru>
parents:
1074
diff
changeset
|
340 if (now - log->error_log_time > 59) { |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
341 ngx_log_error(NGX_LOG_ALERT, r->connection->log, err, |
| 2072 | 342 ngx_write_fd_n " to \"%s\" failed", name); |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
343 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
344 log->error_log_time = now; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
345 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
346 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
347 return; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
348 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
349 |
|
1161
6002e0253221
use 60 seconds interval but not 61 seconds
Igor Sysoev <igor@sysoev.ru>
parents:
1074
diff
changeset
|
350 if (now - log->error_log_time > 59) { |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
351 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, |
| 2072 | 352 ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz", |
| 353 name, n, len); | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
354 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
355 log->error_log_time = now; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
356 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
357 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
358 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
359 |
| 2072 | 360 static ssize_t |
| 361 ngx_http_log_script_write(ngx_http_request_t *r, ngx_http_log_script_t *script, | |
| 362 u_char **name, u_char *buf, size_t len) | |
| 363 { | |
| 364 size_t root; | |
| 365 ssize_t n; | |
| 366 ngx_str_t log, path; | |
| 367 ngx_open_file_info_t of; | |
| 368 ngx_http_log_loc_conf_t *llcf; | |
| 369 ngx_http_core_loc_conf_t *clcf; | |
| 370 | |
|
2087
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
371 if (!r->root_tested) { |
| 2072 | 372 |
| 373 /* test root directory existance */ | |
| 374 | |
| 375 if (ngx_http_map_uri_to_path(r, &path, &root, 0) == NULL) { | |
| 376 /* simulate successfull logging */ | |
| 377 return len; | |
| 378 } | |
| 379 | |
| 380 path.data[root] = '\0'; | |
| 381 | |
| 382 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module); | |
| 383 | |
| 384 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); | |
| 385 | |
| 386 of.valid = clcf->open_file_cache_valid; | |
| 387 of.min_uses = clcf->open_file_cache_min_uses; | |
| 388 of.errors = clcf->open_file_cache_errors; | |
| 389 of.events = clcf->open_file_cache_events; | |
| 390 | |
| 391 if (ngx_open_cached_file(clcf->open_file_cache, &path, &of, r->pool) | |
|
2087
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
392 != NGX_OK) |
| 2072 | 393 { |
|
2087
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
394 if (of.err == 0) { |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
395 /* simulate successfull logging */ |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
396 return len; |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
397 } |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
398 |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
399 ngx_log_error(NGX_LOG_ERR, r->connection->log, of.err, |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
400 "testing \"%s\" existence failed", path.data); |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
401 |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
402 /* simulate successfull logging */ |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
403 return len; |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
404 } |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
405 |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
406 if (!of.is_dir) { |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
407 ngx_log_error(NGX_LOG_ERR, r->connection->log, NGX_ENOTDIR, |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
408 "testing \"%s\" existence failed", path.data); |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
409 |
|
c8039b26a949
always test root existence for access_log with variables
Igor Sysoev <igor@sysoev.ru>
parents:
2080
diff
changeset
|
410 /* simulate successfull logging */ |
| 2072 | 411 return len; |
| 412 } | |
| 413 } | |
| 414 | |
| 415 if (ngx_http_script_run(r, &log, script->lengths->elts, 1, | |
| 416 script->values->elts) | |
| 417 == NULL) | |
| 418 { | |
| 419 /* simulate successfull logging */ | |
| 420 return len; | |
| 421 } | |
| 422 | |
| 423 log.data[log.len - 1] = '\0'; | |
| 424 *name = log.data; | |
| 425 | |
| 426 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 427 "http log \"%s\"", log.data); | |
| 428 | |
| 429 llcf = ngx_http_get_module_loc_conf(r, ngx_http_log_module); | |
| 430 | |
| 431 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); | |
| 432 | |
| 433 of.log = 1; | |
| 434 of.valid = llcf->open_file_cache_valid; | |
| 435 of.min_uses = llcf->open_file_cache_min_uses; | |
| 2277 | 436 of.directio = NGX_OPEN_FILE_DIRECTIO_OFF; |
| 2072 | 437 |
| 438 if (ngx_open_cached_file(llcf->open_file_cache, &log, &of, r->pool) | |
| 439 != NGX_OK) | |
| 440 { | |
| 441 ngx_log_error(NGX_LOG_CRIT, r->connection->log, ngx_errno, | |
| 442 ngx_open_file_n " \"%s\" failed", log.data); | |
| 2077 | 443 /* simulate successfull logging */ |
| 444 return len; | |
| 2072 | 445 } |
| 446 | |
| 447 ngx_log_debug1(NGX_LOG_DEBUG_HTTP, r->connection->log, 0, | |
| 448 "http log #%d", of.fd); | |
| 449 | |
| 450 n = ngx_write_fd(of.fd, buf, len); | |
| 451 | |
| 452 return n; | |
| 453 } | |
| 454 | |
| 455 | |
| 497 | 456 static u_char * |
| 457 ngx_http_log_copy_short(ngx_http_request_t *r, u_char *buf, | |
| 458 ngx_http_log_op_t *op) | |
| 479 | 459 { |
| 460 size_t len; | |
| 461 uintptr_t data; | |
| 462 | |
| 463 len = op->len; | |
| 464 data = op->data; | |
| 465 | |
| 466 while (len--) { | |
| 467 *buf++ = (u_char) (data & 0xff); | |
| 468 data >>= 8; | |
| 469 } | |
| 470 | |
| 471 return buf; | |
| 472 } | |
| 473 | |
| 474 | |
| 497 | 475 static u_char * |
| 476 ngx_http_log_copy_long(ngx_http_request_t *r, u_char *buf, | |
| 477 ngx_http_log_op_t *op) | |
| 479 | 478 { |
| 479 return ngx_cpymem(buf, (u_char *) op->data, op->len); | |
| 480 } | |
| 481 | |
| 482 | |
| 497 | 483 static u_char * |
| 484 ngx_http_log_connection(ngx_http_request_t *r, u_char *buf, | |
| 485 ngx_http_log_op_t *op) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
486 { |
| 455 | 487 return ngx_sprintf(buf, "%ui", r->connection->number); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
488 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
489 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
490 |
| 497 | 491 static u_char * |
| 492 ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
493 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
494 if (r->pipeline) { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
495 *buf = 'p'; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
496 } else { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
497 *buf = '.'; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
498 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
499 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
500 return buf + 1; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
501 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
502 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
503 |
| 497 | 504 static u_char * |
| 505 ngx_http_log_time(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
506 { |
|
178
a8ff48d26cca
nginx-0.0.1-2003-11-11-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
177
diff
changeset
|
507 return ngx_cpymem(buf, ngx_cached_http_log_time.data, |
|
a8ff48d26cca
nginx-0.0.1-2003-11-11-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
177
diff
changeset
|
508 ngx_cached_http_log_time.len); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
509 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
510 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
511 |
| 497 | 512 static u_char * |
| 513 ngx_http_log_msec(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
514 { |
| 563 | 515 ngx_time_t *tp; |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
516 |
| 563 | 517 tp = ngx_timeofday(); |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
518 |
| 563 | 519 return ngx_sprintf(buf, "%T.%03M", tp->sec, tp->msec); |
|
409
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
520 } |
|
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
521 |
|
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
522 |
| 497 | 523 static u_char * |
| 524 ngx_http_log_request_time(ngx_http_request_t *r, u_char *buf, | |
| 525 ngx_http_log_op_t *op) | |
| 526 { | |
|
1179
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
527 ngx_time_t *tp; |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
528 ngx_msec_int_t ms; |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
529 |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
530 tp = ngx_timeofday(); |
| 497 | 531 |
| 1640 | 532 ms = (ngx_msec_int_t) |
| 533 ((tp->sec - r->start_sec) * 1000 + (tp->msec - r->start_msec)); | |
|
1179
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
534 ms = (ms >= 0) ? ms : 0; |
| 497 | 535 |
|
1179
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
536 return ngx_sprintf(buf, "%T.%03M", ms / 1000, ms % 1000); |
| 497 | 537 } |
| 538 | |
| 539 | |
| 540 static u_char * | |
| 541 ngx_http_log_status(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
542 { |
| 455 | 543 return ngx_sprintf(buf, "%ui", |
| 544 r->err_status ? r->err_status : r->headers_out.status); | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
545 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
546 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
547 |
| 497 | 548 static u_char * |
| 573 | 549 ngx_http_log_bytes_sent(ngx_http_request_t *r, u_char *buf, |
| 550 ngx_http_log_op_t *op) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
551 { |
| 455 | 552 return ngx_sprintf(buf, "%O", r->connection->sent); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
553 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
554 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
555 |
| 1271 | 556 /* |
| 557 * although there is a real $body_bytes_sent variable, | |
| 558 * this log operation code function is more optimized for logging | |
| 559 */ | |
| 560 | |
| 497 | 561 static u_char * |
| 577 | 562 ngx_http_log_body_bytes_sent(ngx_http_request_t *r, u_char *buf, |
| 497 | 563 ngx_http_log_op_t *op) |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
564 { |
| 497 | 565 off_t length; |
| 566 | |
| 567 length = r->connection->sent - r->header_size; | |
| 568 | |
| 569 if (length > 0) { | |
| 570 return ngx_sprintf(buf, "%O", length); | |
| 571 } | |
| 572 | |
| 573 *buf = '0'; | |
| 574 | |
| 575 return buf + 1; | |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
576 } |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
577 |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
578 |
| 497 | 579 static u_char * |
| 580 ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf, | |
| 581 ngx_http_log_op_t *op) | |
| 475 | 582 { |
| 663 | 583 return ngx_sprintf(buf, "%O", r->request_length); |
| 475 | 584 } |
| 585 | |
| 586 | |
| 497 | 587 static ngx_int_t |
| 501 | 588 ngx_http_log_variable_compile(ngx_conf_t *cf, ngx_http_log_op_t *op, |
| 589 ngx_str_t *value) | |
| 590 { | |
| 509 | 591 ngx_int_t index; |
| 501 | 592 |
| 509 | 593 index = ngx_http_get_variable_index(cf, value); |
| 594 if (index == NGX_ERROR) { | |
| 501 | 595 return NGX_ERROR; |
| 596 } | |
| 597 | |
| 598 op->len = 0; | |
| 599 op->getlen = ngx_http_log_variable_getlen; | |
| 600 op->run = ngx_http_log_variable; | |
| 509 | 601 op->data = index; |
| 501 | 602 |
| 603 return NGX_OK; | |
| 604 } | |
| 605 | |
| 606 | |
| 607 static size_t | |
| 608 ngx_http_log_variable_getlen(ngx_http_request_t *r, uintptr_t data) | |
| 609 { | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
610 uintptr_t len; |
| 501 | 611 ngx_http_variable_value_t *value; |
| 612 | |
| 613 value = ngx_http_get_indexed_variable(r, data); | |
| 614 | |
| 573 | 615 if (value == NULL || value->not_found) { |
| 501 | 616 return 1; |
| 617 } | |
| 618 | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
619 len = ngx_http_log_escape(NULL, value->data, value->len); |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
620 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
621 value->escape = len ? 1 : 0; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
622 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
623 return value->len + len * 3; |
| 501 | 624 } |
| 625 | |
| 626 | |
| 627 static u_char * | |
| 628 ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
| 629 { | |
| 630 ngx_http_variable_value_t *value; | |
| 631 | |
| 632 value = ngx_http_get_indexed_variable(r, op->data); | |
| 633 | |
| 573 | 634 if (value == NULL || value->not_found) { |
| 501 | 635 *buf = '-'; |
| 636 return buf + 1; | |
| 637 } | |
| 638 | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
639 if (value->escape == 0) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
640 return ngx_cpymem(buf, value->data, value->len); |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
641 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
642 } else { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
643 return (u_char *) ngx_http_log_escape(buf, value->data, value->len); |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
644 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
645 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
646 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
647 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
648 static uintptr_t |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
649 ngx_http_log_escape(u_char *dst, u_char *src, size_t size) |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
650 { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
651 ngx_uint_t i, n; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
652 static u_char hex[] = "0123456789ABCDEF"; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
653 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
654 static uint32_t escape[] = { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
655 0xffffffff, /* 1111 1111 1111 1111 1111 1111 1111 1111 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
656 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
657 /* ?>=< ;:98 7654 3210 /.-, +*)( '&%$ #"! */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
658 0x00000004, /* 0000 0000 0000 0000 0000 0000 0000 0100 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
659 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
660 /* _^]\ [ZYX WVUT SRQP ONML KJIH GFED CBA@ */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
661 0x10000000, /* 0001 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
662 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
663 /* ~}| {zyx wvut srqp onml kjih gfed cba` */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
664 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
665 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
666 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
667 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
668 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
669 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
670 }; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
671 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
672 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
673 if (dst == NULL) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
674 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
675 /* find the number of the characters to be escaped */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
676 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
677 n = 0; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
678 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
679 for (i = 0; i < size; i++) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
680 if (escape[*src >> 5] & (1 << (*src & 0x1f))) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
681 n++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
682 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
683 src++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
684 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
685 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
686 return (uintptr_t) n; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
687 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
688 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
689 for (i = 0; i < size; i++) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
690 if (escape[*src >> 5] & (1 << (*src & 0x1f))) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
691 *dst++ = '\\'; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
692 *dst++ = 'x'; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
693 *dst++ = hex[*src >> 4]; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
694 *dst++ = hex[*src & 0xf]; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
695 src++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
696 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
697 } else { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
698 *dst++ = *src++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
699 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
700 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
701 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
702 return (uintptr_t) dst; |
| 501 | 703 } |
| 704 | |
| 705 | |
| 497 | 706 static void * |
| 707 ngx_http_log_create_main_conf(ngx_conf_t *cf) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
708 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
709 ngx_http_log_main_conf_t *conf; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
710 |
| 573 | 711 ngx_http_log_fmt_t *fmt; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
712 |
| 501 | 713 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_main_conf_t)); |
| 714 if (conf == NULL) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
715 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
716 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
717 |
| 497 | 718 if (ngx_array_init(&conf->formats, cf->pool, 4, sizeof(ngx_http_log_fmt_t)) |
| 573 | 719 != NGX_OK) |
| 497 | 720 { |
| 721 return NGX_CONF_ERROR; | |
| 722 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
723 |
| 573 | 724 fmt = ngx_array_push(&conf->formats); |
| 725 if (fmt == NULL) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
726 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
727 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
728 |
| 573 | 729 fmt->name.len = sizeof("combined") - 1; |
| 730 fmt->name.data = (u_char *) "combined"; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
731 |
| 2261 | 732 fmt->flushes = NULL; |
| 733 | |
| 573 | 734 fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_http_log_op_t)); |
| 735 if (fmt->ops == NULL) { | |
| 569 | 736 return NGX_CONF_ERROR; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
737 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
738 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
739 return conf; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
740 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
741 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
742 |
| 497 | 743 static void * |
| 744 ngx_http_log_create_loc_conf(ngx_conf_t *cf) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
745 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
746 ngx_http_log_loc_conf_t *conf; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
747 |
| 501 | 748 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_loc_conf_t)); |
| 749 if (conf == NULL) { | |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
750 return NGX_CONF_ERROR; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
751 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
752 |
| 2072 | 753 conf->open_file_cache = NGX_CONF_UNSET_PTR; |
| 754 | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
755 return conf; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
756 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
757 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
758 |
| 497 | 759 static char * |
| 760 ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child) | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
761 { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
762 ngx_http_log_loc_conf_t *prev = parent; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
763 ngx_http_log_loc_conf_t *conf = child; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
764 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
765 ngx_http_log_t *log; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
766 ngx_http_log_fmt_t *fmt; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
767 ngx_http_log_main_conf_t *lmcf; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
768 |
| 2072 | 769 if (conf->open_file_cache == NGX_CONF_UNSET_PTR) { |
| 770 | |
| 771 conf->open_file_cache = prev->open_file_cache; | |
| 772 conf->open_file_cache_valid = prev->open_file_cache_valid; | |
| 773 conf->open_file_cache_min_uses = prev->open_file_cache_min_uses; | |
| 774 | |
| 775 if (conf->open_file_cache == NGX_CONF_UNSET_PTR) { | |
| 776 conf->open_file_cache = NULL; | |
| 777 } | |
| 778 } | |
| 779 | |
| 1074 | 780 if (conf->logs || conf->off) { |
| 781 return NGX_CONF_OK; | |
| 782 } | |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
783 |
|
2078
9acbc5e7bcbd
fix variable access_log merging
Igor Sysoev <igor@sysoev.ru>
parents:
2077
diff
changeset
|
784 conf->logs = prev->logs; |
|
9acbc5e7bcbd
fix variable access_log merging
Igor Sysoev <igor@sysoev.ru>
parents:
2077
diff
changeset
|
785 conf->off = prev->off; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
786 |
| 1074 | 787 if (conf->logs || conf->off) { |
| 788 return NGX_CONF_OK; | |
| 789 } | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
790 |
| 1074 | 791 conf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_log_t)); |
| 792 if (conf->logs == NULL) { | |
| 793 return NGX_CONF_ERROR; | |
| 794 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
795 |
| 1074 | 796 log = ngx_array_push(conf->logs); |
| 797 if (log == NULL) { | |
| 798 return NGX_CONF_ERROR; | |
| 799 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
800 |
| 1074 | 801 log->file = ngx_conf_open_file(cf->cycle, &ngx_http_access_log); |
| 802 if (log->file == NULL) { | |
| 803 return NGX_CONF_ERROR; | |
| 804 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
805 |
|
2080
a24c7009de0b
NULL script in default access_log
Igor Sysoev <igor@sysoev.ru>
parents:
2078
diff
changeset
|
806 log->script = NULL; |
| 1074 | 807 log->disk_full_time = 0; |
| 808 log->error_log_time = 0; | |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
809 |
| 1074 | 810 lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); |
| 811 fmt = lmcf->formats.elts; | |
| 812 | |
| 813 /* the default "combined" format */ | |
| 2261 | 814 log->format = &fmt[0]; |
| 1074 | 815 lmcf->combined_used = 1; |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
816 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
817 return NGX_CONF_OK; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
818 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
819 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
820 |
| 497 | 821 static char * |
| 822 ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
823 { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
824 ngx_http_log_loc_conf_t *llcf = conf; |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
825 |
| 2072 | 826 ssize_t buf; |
| 827 ngx_uint_t i, n; | |
| 828 ngx_str_t *value, name; | |
| 829 ngx_http_log_t *log; | |
| 830 ngx_http_log_fmt_t *fmt; | |
| 831 ngx_http_log_main_conf_t *lmcf; | |
| 832 ngx_http_script_compile_t sc; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
833 |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
834 value = cf->args->elts; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
835 |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
836 if (ngx_strcmp(value[1].data, "off") == 0) { |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
837 llcf->off = 1; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
838 return NGX_CONF_OK; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
839 } |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
840 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
841 if (llcf->logs == NULL) { |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
842 llcf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_log_t)); |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
843 if (llcf->logs == NULL) { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
844 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
845 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
846 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
847 |
|
393
5659d773cfa8
nginx-0.0.7-2004-07-15-20:35:51 import
Igor Sysoev <igor@sysoev.ru>
parents:
356
diff
changeset
|
848 lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
849 |
| 501 | 850 log = ngx_array_push(llcf->logs); |
| 851 if (log == NULL) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
852 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
853 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
854 |
| 2072 | 855 ngx_memzero(log, sizeof(ngx_http_log_t)); |
| 856 | |
| 857 n = ngx_http_script_variables_count(&value[1]); | |
| 858 | |
| 859 if (n == 0) { | |
| 860 log->file = ngx_conf_open_file(cf->cycle, &value[1]); | |
| 861 if (log->file == NULL) { | |
| 862 return NGX_CONF_ERROR; | |
| 863 } | |
| 864 | |
| 865 } else { | |
|
2536
a6d6d762c554
small optimization: " == NGX_ERROR" > " != NGX_OK"
Igor Sysoev <igor@sysoev.ru>
parents:
2277
diff
changeset
|
866 if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) { |
| 2072 | 867 return NGX_CONF_ERROR; |
| 868 } | |
| 869 | |
| 870 log->script = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_script_t)); | |
| 871 if (log->script == NULL) { | |
| 872 return NGX_CONF_ERROR; | |
| 873 } | |
| 874 | |
| 875 ngx_memzero(&sc, sizeof(ngx_http_script_compile_t)); | |
| 876 | |
| 877 sc.cf = cf; | |
| 878 sc.source = &value[1]; | |
| 879 sc.lengths = &log->script->lengths; | |
| 880 sc.values = &log->script->values; | |
| 881 sc.variables = n; | |
| 882 sc.complete_lengths = 1; | |
| 883 sc.complete_values = 1; | |
| 884 | |
| 885 if (ngx_http_script_compile(&sc) != NGX_OK) { | |
| 886 return NGX_CONF_ERROR; | |
| 887 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
888 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
889 |
| 571 | 890 if (cf->args->nelts >= 3) { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
891 name = value[2]; |
| 581 | 892 |
| 893 if (ngx_strcmp(name.data, "combined") == 0) { | |
| 894 lmcf->combined_used = 1; | |
| 895 } | |
| 896 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
897 } else { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
898 name.len = sizeof("combined") - 1; |
|
292
a472bfb778b3
nginx-0.0.3-2004-03-17-00:26:01 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
899 name.data = (u_char *) "combined"; |
| 573 | 900 lmcf->combined_used = 1; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
901 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
902 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
903 fmt = lmcf->formats.elts; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
904 for (i = 0; i < lmcf->formats.nelts; i++) { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
905 if (fmt[i].name.len == name.len |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
906 && ngx_strcasecmp(fmt[i].name.data, name.data) == 0) |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
907 { |
| 2261 | 908 log->format = &fmt[i]; |
| 571 | 909 goto buffer; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
910 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
911 } |
|
100
7ebc8b7fb816
nginx-0.0.1-2003-06-03-19:42:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
99
diff
changeset
|
912 |
| 487 | 913 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 914 "unknown log format \"%V\"", &name); | |
| 571 | 915 return NGX_CONF_ERROR; |
| 487 | 916 |
| 571 | 917 buffer: |
| 918 | |
| 919 if (cf->args->nelts == 4) { | |
| 920 if (ngx_strncmp(value[3].data, "buffer=", 7) != 0) { | |
| 921 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 922 "invalid parameter \"%V\"", &value[3]); | |
| 923 return NGX_CONF_ERROR; | |
| 924 } | |
| 925 | |
| 2072 | 926 if (log->script) { |
| 927 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 928 "buffered logs can not have variables in name"); | |
| 929 return NGX_CONF_ERROR; | |
| 930 } | |
| 931 | |
| 571 | 932 name.len = value[3].len - 7; |
| 933 name.data = value[3].data + 7; | |
| 934 | |
| 935 buf = ngx_parse_size(&name); | |
| 936 | |
| 937 if (buf == NGX_ERROR) { | |
| 938 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 939 "invalid parameter \"%V\"", &value[3]); | |
| 940 return NGX_CONF_ERROR; | |
| 941 } | |
| 942 | |
| 943 if (log->file->buffer && log->file->last - log->file->pos != buf) { | |
| 944 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 945 "access_log \"%V\" already defined " | |
| 946 "with different buffer size", &value[1]); | |
| 947 return NGX_CONF_ERROR; | |
| 948 } | |
| 949 | |
| 950 log->file->buffer = ngx_palloc(cf->pool, buf); | |
| 951 if (log->file->buffer == NULL) { | |
| 952 return NGX_CONF_ERROR; | |
| 953 } | |
| 954 | |
| 955 log->file->pos = log->file->buffer; | |
| 956 log->file->last = log->file->buffer + buf; | |
| 957 } | |
| 958 | |
| 959 return NGX_CONF_OK; | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
960 } |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
961 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
962 |
| 497 | 963 static char * |
| 964 ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
965 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
966 ngx_http_log_main_conf_t *lmcf = conf; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
967 |
| 573 | 968 ngx_str_t *value; |
| 969 ngx_uint_t i; | |
| 970 ngx_http_log_fmt_t *fmt; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
971 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
972 value = cf->args->elts; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
973 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
974 fmt = lmcf->formats.elts; |
| 573 | 975 for (i = 0; i < lmcf->formats.nelts; i++) { |
| 976 if (fmt[i].name.len == value[1].len | |
| 977 && ngx_strcmp(fmt[i].name.data, value[1].data) == 0) | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
978 { |
| 2036 | 979 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 980 "duplicate \"log_format\" name \"%V\"", | |
| 981 &value[1]); | |
| 982 return NGX_CONF_ERROR; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
983 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
984 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
985 |
| 501 | 986 fmt = ngx_array_push(&lmcf->formats); |
| 987 if (fmt == NULL) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
988 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
989 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
990 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
991 fmt->name = value[1]; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
992 |
| 2261 | 993 fmt->flushes = ngx_array_create(cf->pool, 4, sizeof(ngx_int_t)); |
| 994 if (fmt->flushes == NULL) { | |
| 995 return NGX_CONF_ERROR; | |
| 996 } | |
| 997 | |
| 573 | 998 fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_http_log_op_t)); |
| 501 | 999 if (fmt->ops == NULL) { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1000 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1001 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1002 |
| 2261 | 1003 return ngx_http_log_compile_format(cf, fmt->flushes, fmt->ops, cf->args, 2); |
| 573 | 1004 } |
| 1005 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1006 |
| 573 | 1007 static char * |
| 2261 | 1008 ngx_http_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes, |
| 1009 ngx_array_t *ops, ngx_array_t *args, ngx_uint_t s) | |
| 573 | 1010 { |
| 880 | 1011 u_char *data, *p, ch; |
| 1012 size_t i, len; | |
| 1013 ngx_str_t *value, var; | |
| 2261 | 1014 ngx_int_t *flush; |
| 880 | 1015 ngx_uint_t bracket; |
| 1016 ngx_http_log_op_t *op; | |
| 1017 ngx_http_log_var_t *v; | |
| 573 | 1018 |
| 1019 value = args->elts; | |
| 1020 | |
| 1021 for ( /* void */ ; s < args->nelts; s++) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1022 |
| 880 | 1023 for (i = 0; i < value[s].len; i++) { |
| 1024 if (value[s].data[i] != '%') { | |
| 1025 continue; | |
| 1026 } | |
| 1027 | |
| 1028 ch = value[s].data[i + 1]; | |
| 1029 | |
| 1030 if ((ch >= 'A' && ch <= 'Z') | |
| 1031 || (ch >= 'a' && ch <= 'z') | |
| 1032 || ch == '{') | |
| 1033 { | |
| 1034 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1035 "the parameters in the \"%%name\" form are not supported, " | |
| 1036 "use the \"$variable\" instead"); | |
| 1037 | |
| 1038 return NGX_CONF_ERROR; | |
| 1039 } | |
| 1040 } | |
| 1041 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1042 i = 0; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1043 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1044 while (i < value[s].len) { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1045 |
| 573 | 1046 op = ngx_array_push(ops); |
| 501 | 1047 if (op == NULL) { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1048 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1049 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1050 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1051 data = &value[s].data[i]; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1052 |
| 880 | 1053 if (value[s].data[i] == '$') { |
| 569 | 1054 |
| 1055 if (++i == value[s].len) { | |
| 1056 goto invalid; | |
| 1057 } | |
| 1058 | |
| 1059 if (value[s].data[i] == '{') { | |
| 1060 bracket = 1; | |
| 1061 | |
| 1062 if (++i == value[s].len) { | |
| 1063 goto invalid; | |
| 1064 } | |
| 1065 | |
| 1066 var.data = &value[s].data[i]; | |
| 1067 | |
| 1068 } else { | |
| 1069 bracket = 0; | |
| 1070 var.data = &value[s].data[i]; | |
| 1071 } | |
| 1072 | |
| 1073 for (var.len = 0; i < value[s].len; i++, var.len++) { | |
| 1074 ch = value[s].data[i]; | |
| 1075 | |
| 1076 if (ch == '}' && bracket) { | |
| 1077 i++; | |
| 1078 bracket = 0; | |
| 1079 break; | |
| 1080 } | |
| 1081 | |
| 1082 if ((ch >= 'A' && ch <= 'Z') | |
| 1083 || (ch >= 'a' && ch <= 'z') | |
| 1084 || (ch >= '0' && ch <= '9') | |
| 1085 || ch == '_') | |
| 1086 { | |
| 1087 continue; | |
| 1088 } | |
| 1089 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1090 break; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1091 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1092 |
| 569 | 1093 if (bracket) { |
| 1094 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1095 "the closing bracket in \"%V\" " | |
| 1096 "variable is missing", &var); | |
| 1097 return NGX_CONF_ERROR; | |
| 1098 } | |
| 1099 | |
| 1100 if (var.len == 0) { | |
| 1101 goto invalid; | |
| 1102 } | |
| 1103 | |
| 577 | 1104 if (ngx_strncmp(var.data, "apache_bytes_sent", 17) == 0) { |
| 1105 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 1106 "use \"$body_bytes_sent\" instead of " | |
| 1107 "\"$apache_bytes_sent\""); | |
| 1108 } | |
| 1109 | |
| 573 | 1110 for (v = ngx_http_log_vars; v->name.len; v++) { |
| 1111 | |
| 1112 if (v->name.len == var.len | |
| 1113 && ngx_strncmp(v->name.data, var.data, var.len) == 0) | |
| 1114 { | |
| 1115 op->len = v->len; | |
| 1116 op->getlen = NULL; | |
| 1117 op->run = v->run; | |
| 1118 op->data = 0; | |
| 1119 | |
| 1120 goto found; | |
| 1121 } | |
| 1122 } | |
| 1123 | |
| 569 | 1124 if (ngx_http_log_variable_compile(cf, op, &var) != NGX_OK) { |
| 1125 return NGX_CONF_ERROR; | |
| 1126 } | |
| 1127 | |
| 2261 | 1128 if (flushes) { |
| 1129 | |
| 1130 flush = ngx_array_push(flushes); | |
| 1131 if (flush == NULL) { | |
| 1132 return NGX_CONF_ERROR; | |
| 1133 } | |
| 1134 | |
| 1135 *flush = op->data; /* variable index */ | |
| 1136 } | |
| 1137 | |
| 573 | 1138 found: |
| 1139 | |
| 1140 continue; | |
| 1141 } | |
| 1142 | |
| 1143 i++; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1144 |
| 880 | 1145 while (i < value[s].len && value[s].data[i] != '$') { |
| 573 | 1146 i++; |
| 1147 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1148 |
| 573 | 1149 len = &value[s].data[i] - data; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1150 |
| 573 | 1151 if (len) { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1152 |
| 573 | 1153 op->len = len; |
| 1154 op->getlen = NULL; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1155 |
| 573 | 1156 if (len <= sizeof(uintptr_t)) { |
| 1157 op->run = ngx_http_log_copy_short; | |
| 1158 op->data = 0; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1159 |
| 573 | 1160 while (len--) { |
| 1161 op->data <<= 8; | |
| 1162 op->data |= data[len]; | |
| 1163 } | |
| 1164 | |
| 1165 } else { | |
| 1166 op->run = ngx_http_log_copy_long; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1167 |
| 2049 | 1168 p = ngx_pnalloc(cf->pool, len); |
| 573 | 1169 if (p == NULL) { |
| 1170 return NGX_CONF_ERROR; | |
| 1171 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1172 |
| 573 | 1173 ngx_memcpy(p, data, len); |
| 1174 op->data = (uintptr_t) p; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1175 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1176 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1177 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1178 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1179 |
| 569 | 1180 return NGX_CONF_OK; |
| 1181 | |
| 1182 invalid: | |
| 1183 | |
| 1184 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%s\"", data); | |
| 1185 | |
| 1186 return NGX_CONF_ERROR; | |
| 1187 } | |
| 1188 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1189 |
| 2072 | 1190 static char * |
| 1191 ngx_http_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) | |
| 1192 { | |
| 1193 ngx_http_log_loc_conf_t *llcf = conf; | |
| 1194 | |
| 1195 time_t inactive, valid; | |
| 1196 ngx_str_t *value, s; | |
| 1197 ngx_int_t max, min_uses; | |
| 1198 ngx_uint_t i; | |
| 1199 | |
| 1200 if (llcf->open_file_cache != NGX_CONF_UNSET_PTR) { | |
| 1201 return "is duplicate"; | |
| 1202 } | |
| 1203 | |
| 1204 value = cf->args->elts; | |
| 1205 | |
| 1206 max = 0; | |
| 1207 inactive = 10; | |
| 1208 valid = 60; | |
| 1209 min_uses = 1; | |
| 1210 | |
| 1211 for (i = 1; i < cf->args->nelts; i++) { | |
| 1212 | |
| 1213 if (ngx_strncmp(value[i].data, "max=", 4) == 0) { | |
| 1214 | |
| 1215 max = ngx_atoi(value[i].data + 4, value[i].len - 4); | |
| 1216 if (max == NGX_ERROR) { | |
| 1217 goto failed; | |
| 1218 } | |
| 1219 | |
| 1220 continue; | |
| 1221 } | |
| 1222 | |
| 1223 if (ngx_strncmp(value[i].data, "inactive=", 9) == 0) { | |
| 1224 | |
| 1225 s.len = value[i].len - 9; | |
| 1226 s.data = value[i].data + 9; | |
| 1227 | |
| 1228 inactive = ngx_parse_time(&s, 1); | |
| 1229 if (inactive < 0) { | |
| 1230 goto failed; | |
| 1231 } | |
| 1232 | |
| 1233 continue; | |
| 1234 } | |
| 1235 | |
| 1236 if (ngx_strncmp(value[i].data, "min_uses=", 9) == 0) { | |
| 1237 | |
| 1238 min_uses = ngx_atoi(value[i].data + 9, value[i].len - 9); | |
| 1239 if (min_uses == NGX_ERROR) { | |
| 1240 goto failed; | |
| 1241 } | |
| 1242 | |
| 1243 continue; | |
| 1244 } | |
| 1245 | |
| 1246 if (ngx_strncmp(value[i].data, "valid=", 6) == 0) { | |
| 1247 | |
| 1248 s.len = value[i].len - 6; | |
| 1249 s.data = value[i].data + 6; | |
| 1250 | |
| 1251 valid = ngx_parse_time(&s, 1); | |
| 1252 if (valid < 0) { | |
| 1253 goto failed; | |
| 1254 } | |
| 1255 | |
| 1256 continue; | |
| 1257 } | |
| 1258 | |
| 1259 if (ngx_strcmp(value[i].data, "off") == 0) { | |
| 1260 | |
| 1261 llcf->open_file_cache = NULL; | |
| 1262 | |
| 1263 continue; | |
| 1264 } | |
| 1265 | |
| 1266 failed: | |
| 1267 | |
| 1268 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1269 "invalid \"open_log_file_cache\" parameter \"%V\"", | |
| 1270 &value[i]); | |
| 1271 return NGX_CONF_ERROR; | |
| 1272 } | |
| 1273 | |
| 1274 if (llcf->open_file_cache == NULL) { | |
| 1275 return NGX_CONF_OK; | |
| 1276 } | |
| 1277 | |
| 1278 if (max == 0) { | |
| 1279 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1280 "\"open_log_file_cache\" must have \"max\" parameter"); | |
| 1281 return NGX_CONF_ERROR; | |
| 1282 } | |
| 1283 | |
| 1284 llcf->open_file_cache = ngx_open_file_cache_init(cf->pool, max, inactive); | |
| 1285 | |
| 1286 if (llcf->open_file_cache) { | |
| 1287 | |
| 1288 llcf->open_file_cache_valid = valid; | |
| 1289 llcf->open_file_cache_min_uses = min_uses; | |
| 1290 | |
| 1291 return NGX_CONF_OK; | |
| 1292 } | |
| 1293 | |
| 1294 return NGX_CONF_ERROR; | |
| 1295 } | |
| 1296 | |
| 1297 | |
| 569 | 1298 static ngx_int_t |
| 573 | 1299 ngx_http_log_init(ngx_conf_t *cf) |
| 569 | 1300 { |
| 573 | 1301 ngx_str_t *value; |
| 1302 ngx_array_t a; | |
| 581 | 1303 ngx_http_handler_pt *h; |
| 573 | 1304 ngx_http_log_fmt_t *fmt; |
| 1305 ngx_http_log_main_conf_t *lmcf; | |
| 569 | 1306 ngx_http_core_main_conf_t *cmcf; |
| 1307 | |
| 573 | 1308 lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); |
| 1309 | |
| 1310 if (lmcf->combined_used) { | |
| 1311 if (ngx_array_init(&a, cf->pool, 1, sizeof(ngx_str_t)) != NGX_OK) { | |
| 1312 return NGX_ERROR; | |
| 1313 } | |
| 1314 | |
| 1315 value = ngx_array_push(&a); | |
| 1316 if (value == NULL) { | |
| 1317 return NGX_ERROR; | |
| 1318 } | |
| 1319 | |
| 1320 *value = ngx_http_combined_fmt; | |
| 1321 fmt = lmcf->formats.elts; | |
| 1322 | |
| 2261 | 1323 if (ngx_http_log_compile_format(cf, NULL, fmt->ops, &a, 0) |
| 573 | 1324 != NGX_CONF_OK) |
| 1325 { | |
| 1326 return NGX_ERROR; | |
| 1327 } | |
| 1328 } | |
| 1329 | |
| 1330 cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); | |
| 569 | 1331 |
| 581 | 1332 h = ngx_array_push(&cmcf->phases[NGX_HTTP_LOG_PHASE].handlers); |
| 1333 if (h == NULL) { | |
| 1334 return NGX_ERROR; | |
| 1335 } | |
| 1336 | |
| 1337 *h = ngx_http_log_handler; | |
| 569 | 1338 |
| 1339 return NGX_OK; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1340 } |