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