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