Mercurial > hg > nginx
annotate src/http/modules/ngx_http_log_module.c @ 2036:1c009c5a163b
fix error log message
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 26 May 2008 10:54:59 +0000 |
| parents | 66dc85397a90 |
| children | 2a92804f4109 |
| rev | line source |
|---|---|
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
1 |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
2 /* |
|
444
42d11f017717
nginx-0.1.0-2004-09-29-20:00:49 import; remove years from copyright
Igor Sysoev <igor@sysoev.ru>
parents:
441
diff
changeset
|
3 * Copyright (C) Igor Sysoev |
|
441
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
4 */ |
|
da8c5707af39
nginx-0.1.0-2004-09-28-12:34:51 import; set copyright and remove unused files
Igor Sysoev <igor@sysoev.ru>
parents:
427
diff
changeset
|
5 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
6 |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
7 #include <ngx_config.h> |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
8 #include <ngx_core.h> |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
9 #include <ngx_http.h> |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
10 #include <nginx.h> |
|
26
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; | |
| 32 ngx_array_t *ops; /* array of ngx_http_log_op_t */ | |
| 33 } ngx_http_log_fmt_t; | |
| 34 | |
| 657 | 35 |
| 573 | 36 typedef struct { |
| 37 ngx_array_t formats; /* array of ngx_http_log_fmt_t */ | |
| 38 ngx_uint_t combined_used; /* unsigned combined_used:1 */ | |
| 39 } ngx_http_log_main_conf_t; | |
| 40 | |
| 657 | 41 |
| 573 | 42 typedef struct { |
| 43 ngx_open_file_t *file; | |
| 633 | 44 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
|
45 time_t error_log_time; |
| 573 | 46 ngx_array_t *ops; /* array of ngx_http_log_op_t */ |
| 47 } ngx_http_log_t; | |
| 48 | |
| 657 | 49 |
| 573 | 50 typedef struct { |
| 51 ngx_array_t *logs; /* array of ngx_http_log_t */ | |
| 52 ngx_uint_t off; /* unsigned off:1 */ | |
| 53 } ngx_http_log_loc_conf_t; | |
| 54 | |
| 55 | |
| 56 typedef struct { | |
| 57 ngx_str_t name; | |
| 58 size_t len; | |
| 59 ngx_http_log_op_run_pt run; | |
| 60 } ngx_http_log_var_t; | |
| 61 | |
| 62 | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
63 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
|
64 u_char *buf, 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
|
65 |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
66 static u_char *ngx_http_log_connection(ngx_http_request_t *r, u_char *buf, |
| 497 | 67 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
|
68 static u_char *ngx_http_log_pipe(ngx_http_request_t *r, u_char *buf, |
| 497 | 69 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
|
70 static u_char *ngx_http_log_time(ngx_http_request_t *r, u_char *buf, |
| 497 | 71 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
|
72 static u_char *ngx_http_log_msec(ngx_http_request_t *r, u_char *buf, |
| 497 | 73 ngx_http_log_op_t *op); |
| 74 static u_char *ngx_http_log_request_time(ngx_http_request_t *r, u_char *buf, | |
| 75 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
|
76 static u_char *ngx_http_log_status(ngx_http_request_t *r, u_char *buf, |
| 497 | 77 ngx_http_log_op_t *op); |
| 573 | 78 static u_char *ngx_http_log_bytes_sent(ngx_http_request_t *r, u_char *buf, |
| 497 | 79 ngx_http_log_op_t *op); |
| 577 | 80 static u_char *ngx_http_log_body_bytes_sent(ngx_http_request_t *r, |
| 573 | 81 u_char *buf, ngx_http_log_op_t *op); |
| 475 | 82 static u_char *ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf, |
| 497 | 83 ngx_http_log_op_t *op); |
| 479 | 84 |
| 501 | 85 static ngx_int_t ngx_http_log_variable_compile(ngx_conf_t *cf, |
| 86 ngx_http_log_op_t *op, ngx_str_t *value); | |
| 87 static size_t ngx_http_log_variable_getlen(ngx_http_request_t *r, | |
| 88 uintptr_t data); | |
| 89 static u_char *ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, | |
| 90 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
|
91 static uintptr_t ngx_http_log_escape(u_char *dst, u_char *src, size_t size); |
| 501 | 92 |
| 93 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
94 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
|
95 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
|
96 static char *ngx_http_log_merge_loc_conf(ngx_conf_t *cf, void *parent, |
| 497 | 97 void *child); |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
98 static char *ngx_http_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, |
| 497 | 99 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
|
100 static char *ngx_http_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, |
| 497 | 101 void *conf); |
| 573 | 102 static char *ngx_http_log_compile_format(ngx_conf_t *cf, |
| 103 ngx_array_t *ops, ngx_array_t *args, ngx_uint_t s); | |
| 104 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
|
105 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
106 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
107 static 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
|
108 |
| 497 | 109 { ngx_string("log_format"), |
| 110 NGX_HTTP_MAIN_CONF|NGX_HTTP_SRV_CONF|NGX_HTTP_LOC_CONF|NGX_CONF_2MORE, | |
| 111 ngx_http_log_set_format, | |
| 112 NGX_HTTP_MAIN_CONF_OFFSET, | |
| 113 0, | |
| 114 NULL }, | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
115 |
| 497 | 116 { ngx_string("access_log"), |
| 645 | 117 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
|
118 |NGX_HTTP_LMT_CONF|NGX_CONF_TAKE123, |
| 497 | 119 ngx_http_log_set_log, |
| 120 NGX_HTTP_LOC_CONF_OFFSET, | |
| 121 0, | |
| 122 NULL }, | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
123 |
| 497 | 124 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
|
125 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
126 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
127 |
| 667 | 128 static ngx_http_module_t ngx_http_log_module_ctx = { |
| 880 | 129 NULL, /* preconfiguration */ |
| 573 | 130 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
|
131 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
132 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
|
133 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
|
134 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
135 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
|
136 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
|
137 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
138 ngx_http_log_create_loc_conf, /* create location configration */ |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
139 ngx_http_log_merge_loc_conf /* merge location configration */ |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
140 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
141 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
142 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
143 ngx_module_t ngx_http_log_module = { |
| 509 | 144 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
|
145 &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
|
146 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
|
147 NGX_HTTP_MODULE, /* module type */ |
| 541 | 148 NULL, /* init master */ |
| 573 | 149 NULL, /* init module */ |
| 541 | 150 NULL, /* init process */ |
| 151 NULL, /* init thread */ | |
| 152 NULL, /* exit thread */ | |
| 153 NULL, /* exit process */ | |
| 154 NULL, /* exit master */ | |
| 155 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
|
156 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
157 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
158 |
| 1074 | 159 static ngx_str_t ngx_http_access_log = ngx_string(NGX_HTTP_LOG_PATH); |
| 573 | 160 |
| 161 | |
| 162 static ngx_str_t ngx_http_combined_fmt = | |
| 581 | 163 ngx_string("$remote_addr - $remote_user [$time_local] " |
| 577 | 164 "\"$request\" $status $body_bytes_sent " |
| 573 | 165 "\"$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
|
166 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
167 |
| 573 | 168 static ngx_http_log_var_t ngx_http_log_vars[] = { |
| 169 { ngx_string("connection"), NGX_ATOMIC_T_LEN, ngx_http_log_connection }, | |
| 170 { ngx_string("pipe"), 1, ngx_http_log_pipe }, | |
| 581 | 171 { ngx_string("time_local"), sizeof("28/Sep/1970:12:00:00 +0600") - 1, |
| 573 | 172 ngx_http_log_time }, |
| 173 { 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
|
174 { ngx_string("request_time"), NGX_TIME_T_LEN + 4, |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
175 ngx_http_log_request_time }, |
| 573 | 176 { ngx_string("status"), 3, ngx_http_log_status }, |
| 177 { ngx_string("bytes_sent"), NGX_OFF_T_LEN, ngx_http_log_bytes_sent }, | |
| 577 | 178 { ngx_string("body_bytes_sent"), NGX_OFF_T_LEN, |
| 179 ngx_http_log_body_bytes_sent }, | |
| 573 | 180 { ngx_string("apache_bytes_sent"), NGX_OFF_T_LEN, |
| 577 | 181 ngx_http_log_body_bytes_sent }, |
| 573 | 182 { ngx_string("request_length"), NGX_SIZE_T_LEN, |
| 183 ngx_http_log_request_length }, | |
| 184 | |
| 185 { ngx_null_string, 0, NULL } | |
| 186 }; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
187 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
188 |
| 497 | 189 ngx_int_t |
| 190 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
|
191 { |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
192 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
|
193 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
|
194 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
|
195 ngx_http_log_t *log; |
| 571 | 196 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
|
197 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
|
198 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
|
199 |
|
210
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
200 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
|
201 "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
|
202 |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
203 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
|
204 |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
205 if (lcf->off) { |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
206 return NGX_OK; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
207 } |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
208 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
209 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
|
210 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
|
211 |
| 633 | 212 if (ngx_time() == log[l].disk_full_time) { |
| 213 | |
| 214 /* | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
215 * on FreeBSD writing to a full filesystem with enabled softupdates |
| 633 | 216 * 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
|
217 * filesystem, so we skip writing to a log for one second |
| 633 | 218 */ |
| 219 | |
| 220 continue; | |
| 221 } | |
| 222 | |
|
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 len = 0; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
224 op = log[l].ops->elts; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
225 for (i = 0; i < log[l].ops->nelts; i++) { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
226 if (op[i].len == 0) { |
| 479 | 227 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
|
228 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
229 } else { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
230 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
|
231 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
232 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
233 |
| 571 | 234 len += NGX_LINEFEED_SIZE; |
| 235 | |
| 236 file = log[l].file; | |
| 237 | |
| 238 if (file->buffer) { | |
| 239 | |
| 240 if (len > (size_t) (file->last - file->pos)) { | |
| 241 | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
242 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
|
243 file->pos - file->buffer); |
| 571 | 244 |
| 245 file->pos = file->buffer; | |
| 246 } | |
| 247 | |
| 248 if (len <= (size_t) (file->last - file->pos)) { | |
| 249 | |
| 250 p = file->pos; | |
| 251 | |
| 252 for (i = 0; i < log[l].ops->nelts; i++) { | |
| 253 p = op[i].run(r, p, &op[i]); | |
| 254 } | |
| 255 | |
| 256 ngx_linefeed(p); | |
| 257 | |
| 258 file->pos = p; | |
| 259 | |
| 260 continue; | |
| 261 } | |
| 262 } | |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
263 |
| 501 | 264 line = ngx_palloc(r->pool, len); |
| 265 if (line == NULL) { | |
| 473 | 266 return NGX_ERROR; |
| 267 } | |
| 268 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
269 p = line; |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
270 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
271 for (i = 0; i < log[l].ops->nelts; i++) { |
| 479 | 272 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
|
273 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
274 |
| 571 | 275 ngx_linefeed(p); |
| 276 | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
277 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
|
278 } |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
279 |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
280 return NGX_OK; |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
281 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
282 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
283 |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
284 static void |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
285 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
|
286 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
|
287 { |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
288 time_t now; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
289 ssize_t n; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
290 ngx_err_t err; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
291 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
292 n = ngx_write_fd(log->file->fd, buf, len); |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
293 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
294 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
|
295 return; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
296 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
297 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
298 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
|
299 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
300 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
|
301 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
|
302 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
303 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
|
304 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
|
305 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
306 |
|
1161
6002e0253221
use 60 seconds interval but not 61 seconds
Igor Sysoev <igor@sysoev.ru>
parents:
1074
diff
changeset
|
307 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
|
308 ngx_log_error(NGX_LOG_ALERT, r->connection->log, err, |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
309 ngx_write_fd_n " to \"%V\" failed", |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
310 &log->file->name); |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
311 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
312 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
|
313 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
314 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
315 return; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
316 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
317 |
|
1161
6002e0253221
use 60 seconds interval but not 61 seconds
Igor Sysoev <igor@sysoev.ru>
parents:
1074
diff
changeset
|
318 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
|
319 ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
320 ngx_write_fd_n " to \"%V\" was incomplete: %z of %uz", |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
321 &log->file->name, n, len); |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
322 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
323 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
|
324 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
325 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
326 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
327 |
| 497 | 328 static u_char * |
| 329 ngx_http_log_copy_short(ngx_http_request_t *r, u_char *buf, | |
| 330 ngx_http_log_op_t *op) | |
| 479 | 331 { |
| 332 size_t len; | |
| 333 uintptr_t data; | |
| 334 | |
| 335 len = op->len; | |
| 336 data = op->data; | |
| 337 | |
| 338 while (len--) { | |
| 339 *buf++ = (u_char) (data & 0xff); | |
| 340 data >>= 8; | |
| 341 } | |
| 342 | |
| 343 return buf; | |
| 344 } | |
| 345 | |
| 346 | |
| 497 | 347 static u_char * |
| 348 ngx_http_log_copy_long(ngx_http_request_t *r, u_char *buf, | |
| 349 ngx_http_log_op_t *op) | |
| 479 | 350 { |
| 351 return ngx_cpymem(buf, (u_char *) op->data, op->len); | |
| 352 } | |
| 353 | |
| 354 | |
| 497 | 355 static u_char * |
| 356 ngx_http_log_connection(ngx_http_request_t *r, u_char *buf, | |
| 357 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
|
358 { |
| 455 | 359 return ngx_sprintf(buf, "%ui", r->connection->number); |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
360 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
361 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
362 |
| 497 | 363 static u_char * |
| 364 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
|
365 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
366 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
|
367 *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
|
368 } else { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
369 *buf = '.'; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
370 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
371 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
372 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
|
373 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
374 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
375 |
| 497 | 376 static u_char * |
| 377 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
|
378 { |
|
178
a8ff48d26cca
nginx-0.0.1-2003-11-11-00:09:22 import
Igor Sysoev <igor@sysoev.ru>
parents:
177
diff
changeset
|
379 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
|
380 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
|
381 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
382 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
383 |
| 497 | 384 static u_char * |
| 385 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
|
386 { |
| 563 | 387 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
|
388 |
| 563 | 389 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
|
390 |
| 563 | 391 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
|
392 } |
|
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
393 |
|
8ac40cae79f0
nginx-0.0.10-2004-08-29-07:55:41 import
Igor Sysoev <igor@sysoev.ru>
parents:
393
diff
changeset
|
394 |
| 497 | 395 static u_char * |
| 396 ngx_http_log_request_time(ngx_http_request_t *r, u_char *buf, | |
| 397 ngx_http_log_op_t *op) | |
| 398 { | |
|
1179
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
399 ngx_time_t *tp; |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
400 ngx_msec_int_t ms; |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
401 |
|
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
402 tp = ngx_timeofday(); |
| 497 | 403 |
| 1640 | 404 ms = (ngx_msec_int_t) |
| 405 ((tp->sec - r->start_sec) * 1000 + (tp->msec - r->start_msec)); | |
|
1179
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
406 ms = (ms >= 0) ? ms : 0; |
| 497 | 407 |
|
1179
6e2216ad2c87
$request_time has millisecond precision
Igor Sysoev <igor@sysoev.ru>
parents:
1161
diff
changeset
|
408 return ngx_sprintf(buf, "%T.%03M", ms / 1000, ms % 1000); |
| 497 | 409 } |
| 410 | |
| 411 | |
| 412 static u_char * | |
| 413 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
|
414 { |
| 455 | 415 return ngx_sprintf(buf, "%ui", |
| 416 r->err_status ? r->err_status : r->headers_out.status); | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
417 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
418 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
419 |
| 497 | 420 static u_char * |
| 573 | 421 ngx_http_log_bytes_sent(ngx_http_request_t *r, u_char *buf, |
| 422 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
|
423 { |
| 455 | 424 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
|
425 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
426 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
427 |
| 1271 | 428 /* |
| 429 * although there is a real $body_bytes_sent variable, | |
| 430 * this log operation code function is more optimized for logging | |
| 431 */ | |
| 432 | |
| 497 | 433 static u_char * |
| 577 | 434 ngx_http_log_body_bytes_sent(ngx_http_request_t *r, u_char *buf, |
| 497 | 435 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
|
436 { |
| 497 | 437 off_t length; |
| 438 | |
| 439 length = r->connection->sent - r->header_size; | |
| 440 | |
| 441 if (length > 0) { | |
| 442 return ngx_sprintf(buf, "%O", length); | |
| 443 } | |
| 444 | |
| 445 *buf = '0'; | |
| 446 | |
| 447 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
|
448 } |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
449 |
|
00cafae0bdf1
nginx-0.0.1-2003-12-14-23:10:27 import
Igor Sysoev <igor@sysoev.ru>
parents:
208
diff
changeset
|
450 |
| 497 | 451 static u_char * |
| 452 ngx_http_log_request_length(ngx_http_request_t *r, u_char *buf, | |
| 453 ngx_http_log_op_t *op) | |
| 475 | 454 { |
| 663 | 455 return ngx_sprintf(buf, "%O", r->request_length); |
| 475 | 456 } |
| 457 | |
| 458 | |
| 497 | 459 static ngx_int_t |
| 501 | 460 ngx_http_log_variable_compile(ngx_conf_t *cf, ngx_http_log_op_t *op, |
| 461 ngx_str_t *value) | |
| 462 { | |
| 509 | 463 ngx_int_t index; |
| 501 | 464 |
| 509 | 465 index = ngx_http_get_variable_index(cf, value); |
| 466 if (index == NGX_ERROR) { | |
| 501 | 467 return NGX_ERROR; |
| 468 } | |
| 469 | |
| 470 op->len = 0; | |
| 471 op->getlen = ngx_http_log_variable_getlen; | |
| 472 op->run = ngx_http_log_variable; | |
| 509 | 473 op->data = index; |
| 501 | 474 |
| 475 return NGX_OK; | |
| 476 } | |
| 477 | |
| 478 | |
| 479 static size_t | |
| 480 ngx_http_log_variable_getlen(ngx_http_request_t *r, uintptr_t data) | |
| 481 { | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
482 uintptr_t len; |
| 501 | 483 ngx_http_variable_value_t *value; |
| 484 | |
| 485 value = ngx_http_get_indexed_variable(r, data); | |
| 486 | |
| 573 | 487 if (value == NULL || value->not_found) { |
| 501 | 488 return 1; |
| 489 } | |
| 490 | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
491 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
|
492 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
493 value->escape = len ? 1 : 0; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
494 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
495 return value->len + len * 3; |
| 501 | 496 } |
| 497 | |
| 498 | |
| 499 static u_char * | |
| 500 ngx_http_log_variable(ngx_http_request_t *r, u_char *buf, ngx_http_log_op_t *op) | |
| 501 { | |
| 502 ngx_http_variable_value_t *value; | |
| 503 | |
| 504 value = ngx_http_get_indexed_variable(r, op->data); | |
| 505 | |
| 573 | 506 if (value == NULL || value->not_found) { |
| 501 | 507 *buf = '-'; |
| 508 return buf + 1; | |
| 509 } | |
| 510 | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
511 if (value->escape == 0) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
512 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
|
513 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
514 } else { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
515 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
|
516 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
517 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
518 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
519 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
520 static uintptr_t |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
521 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
|
522 { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
523 ngx_uint_t i, n; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
524 static u_char hex[] = "0123456789ABCDEF"; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
525 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
526 static uint32_t escape[] = { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
527 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
|
528 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
529 /* ?>=< ;:98 7654 3210 /.-, +*)( '&%$ #"! */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
530 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
|
531 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
532 /* _^]\ [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
|
533 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
|
534 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
535 /* ~}| {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
|
536 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
537 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
538 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
539 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
540 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
541 0x00000000, /* 0000 0000 0000 0000 0000 0000 0000 0000 */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
542 }; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
543 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
544 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
545 if (dst == NULL) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
546 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
547 /* 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
|
548 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
549 n = 0; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
550 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
551 for (i = 0; i < size; i++) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
552 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
|
553 n++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
554 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
555 src++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
556 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
557 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
558 return (uintptr_t) n; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
559 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
560 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
561 for (i = 0; i < size; i++) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
562 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
|
563 *dst++ = '\\'; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
564 *dst++ = 'x'; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
565 *dst++ = hex[*src >> 4]; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
566 *dst++ = hex[*src & 0xf]; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
567 src++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
568 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
569 } else { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
570 *dst++ = *src++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
571 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
572 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
573 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
574 return (uintptr_t) dst; |
| 501 | 575 } |
| 576 | |
| 577 | |
| 497 | 578 static void * |
| 579 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
|
580 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
581 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
|
582 |
| 573 | 583 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
|
584 |
| 501 | 585 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_main_conf_t)); |
| 586 if (conf == NULL) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
587 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
|
588 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
589 |
| 497 | 590 if (ngx_array_init(&conf->formats, cf->pool, 4, sizeof(ngx_http_log_fmt_t)) |
| 573 | 591 != NGX_OK) |
| 497 | 592 { |
| 593 return NGX_CONF_ERROR; | |
| 594 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
595 |
| 573 | 596 fmt = ngx_array_push(&conf->formats); |
| 597 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
|
598 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
|
599 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
600 |
| 573 | 601 fmt->name.len = sizeof("combined") - 1; |
| 602 fmt->name.data = (u_char *) "combined"; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
603 |
| 573 | 604 fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_http_log_op_t)); |
| 605 if (fmt->ops == NULL) { | |
| 569 | 606 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
|
607 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
608 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
609 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
|
610 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
611 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
612 |
| 497 | 613 static void * |
| 614 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
|
615 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
616 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
|
617 |
| 501 | 618 conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_log_loc_conf_t)); |
| 619 if (conf == NULL) { | |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
620 return NGX_CONF_ERROR; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
621 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
622 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
623 return conf; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
624 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
625 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
626 |
| 497 | 627 static char * |
| 628 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
|
629 { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
630 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
|
631 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
|
632 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
633 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
|
634 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
|
635 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
|
636 |
| 1074 | 637 if (conf->logs || conf->off) { |
| 638 return NGX_CONF_OK; | |
| 639 } | |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
640 |
| 1074 | 641 *conf = *prev; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
642 |
| 1074 | 643 if (conf->logs || conf->off) { |
| 644 return NGX_CONF_OK; | |
| 645 } | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
646 |
| 1074 | 647 conf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_http_log_t)); |
| 648 if (conf->logs == NULL) { | |
| 649 return NGX_CONF_ERROR; | |
| 650 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
651 |
| 1074 | 652 log = ngx_array_push(conf->logs); |
| 653 if (log == NULL) { | |
| 654 return NGX_CONF_ERROR; | |
| 655 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
656 |
| 1074 | 657 log->file = ngx_conf_open_file(cf->cycle, &ngx_http_access_log); |
| 658 if (log->file == NULL) { | |
| 659 return NGX_CONF_ERROR; | |
| 660 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
661 |
| 1074 | 662 log->disk_full_time = 0; |
| 663 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
|
664 |
| 1074 | 665 lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); |
| 666 fmt = lmcf->formats.elts; | |
| 667 | |
| 668 /* the default "combined" format */ | |
| 669 log->ops = fmt[0].ops; | |
| 670 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
|
671 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
672 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
|
673 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
674 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
675 |
| 497 | 676 static char * |
| 677 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
|
678 { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
679 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
|
680 |
| 571 | 681 ssize_t buf; |
|
290
87e73f067470
nginx-0.0.2-2004-03-16-10:10:12 import
Igor Sysoev <igor@sysoev.ru>
parents:
282
diff
changeset
|
682 ngx_uint_t 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
|
683 ngx_str_t *value, name; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
684 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
|
685 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
|
686 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
|
687 |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
688 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
|
689 |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
690 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
|
691 llcf->off = 1; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
692 return NGX_CONF_OK; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
693 } |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
694 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
695 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
|
696 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
|
697 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
|
698 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
|
699 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
700 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
701 |
|
393
5659d773cfa8
nginx-0.0.7-2004-07-15-20:35:51 import
Igor Sysoev <igor@sysoev.ru>
parents:
356
diff
changeset
|
702 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
|
703 |
| 501 | 704 log = ngx_array_push(llcf->logs); |
| 705 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
|
706 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
|
707 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
708 |
| 501 | 709 log->file = ngx_conf_open_file(cf->cycle, &value[1]); |
| 710 if (log->file == NULL) { | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
711 return NGX_CONF_ERROR; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
712 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
713 |
| 633 | 714 log->disk_full_time = 0; |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
715 log->error_log_time = 0; |
| 633 | 716 |
| 571 | 717 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
|
718 name = value[2]; |
| 581 | 719 |
| 720 if (ngx_strcmp(name.data, "combined") == 0) { | |
| 721 lmcf->combined_used = 1; | |
| 722 } | |
| 723 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
724 } else { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
725 name.len = sizeof("combined") - 1; |
|
292
a472bfb778b3
nginx-0.0.3-2004-03-17-00:26:01 import
Igor Sysoev <igor@sysoev.ru>
parents:
290
diff
changeset
|
726 name.data = (u_char *) "combined"; |
| 573 | 727 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
|
728 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
729 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
730 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
|
731 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
|
732 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
|
733 && 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
|
734 { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
735 log->ops = fmt[i].ops; |
| 571 | 736 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
|
737 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
738 } |
|
100
7ebc8b7fb816
nginx-0.0.1-2003-06-03-19:42:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
99
diff
changeset
|
739 |
| 487 | 740 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 741 "unknown log format \"%V\"", &name); | |
| 571 | 742 return NGX_CONF_ERROR; |
| 487 | 743 |
| 571 | 744 buffer: |
| 745 | |
| 746 if (cf->args->nelts == 4) { | |
| 747 if (ngx_strncmp(value[3].data, "buffer=", 7) != 0) { | |
| 748 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 749 "invalid parameter \"%V\"", &value[3]); | |
| 750 return NGX_CONF_ERROR; | |
| 751 } | |
| 752 | |
| 753 name.len = value[3].len - 7; | |
| 754 name.data = value[3].data + 7; | |
| 755 | |
| 756 buf = ngx_parse_size(&name); | |
| 757 | |
| 758 if (buf == NGX_ERROR) { | |
| 759 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 760 "invalid parameter \"%V\"", &value[3]); | |
| 761 return NGX_CONF_ERROR; | |
| 762 } | |
| 763 | |
| 764 if (log->file->buffer && log->file->last - log->file->pos != buf) { | |
| 765 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 766 "access_log \"%V\" already defined " | |
| 767 "with different buffer size", &value[1]); | |
| 768 return NGX_CONF_ERROR; | |
| 769 } | |
| 770 | |
| 771 log->file->buffer = ngx_palloc(cf->pool, buf); | |
| 772 if (log->file->buffer == NULL) { | |
| 773 return NGX_CONF_ERROR; | |
| 774 } | |
| 775 | |
| 776 log->file->pos = log->file->buffer; | |
| 777 log->file->last = log->file->buffer + buf; | |
| 778 } | |
| 779 | |
| 780 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
|
781 } |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
782 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
783 |
| 497 | 784 static char * |
| 785 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
|
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 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
|
788 |
| 573 | 789 ngx_str_t *value; |
| 790 ngx_uint_t i; | |
| 791 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
|
792 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
793 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
|
794 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
795 fmt = lmcf->formats.elts; |
| 573 | 796 for (i = 0; i < lmcf->formats.nelts; i++) { |
| 797 if (fmt[i].name.len == value[1].len | |
| 798 && 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
|
799 { |
| 2036 | 800 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 801 "duplicate \"log_format\" name \"%V\"", | |
| 802 &value[1]); | |
| 803 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
|
804 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
805 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
806 |
| 501 | 807 fmt = ngx_array_push(&lmcf->formats); |
| 808 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
|
809 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
|
810 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
811 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
812 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
|
813 |
| 573 | 814 fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_http_log_op_t)); |
| 501 | 815 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
|
816 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
|
817 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
818 |
| 573 | 819 return ngx_http_log_compile_format(cf, fmt->ops, cf->args, 2); |
| 820 } | |
| 821 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
822 |
| 573 | 823 static char * |
| 824 ngx_http_log_compile_format(ngx_conf_t *cf, ngx_array_t *ops, | |
| 825 ngx_array_t *args, ngx_uint_t s) | |
| 826 { | |
| 880 | 827 u_char *data, *p, ch; |
| 828 size_t i, len; | |
| 829 ngx_str_t *value, var; | |
| 830 ngx_uint_t bracket; | |
| 831 ngx_http_log_op_t *op; | |
| 832 ngx_http_log_var_t *v; | |
| 573 | 833 |
| 834 value = args->elts; | |
| 835 | |
| 836 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
|
837 |
| 880 | 838 for (i = 0; i < value[s].len; i++) { |
| 839 if (value[s].data[i] != '%') { | |
| 840 continue; | |
| 841 } | |
| 842 | |
| 843 ch = value[s].data[i + 1]; | |
| 844 | |
| 845 if ((ch >= 'A' && ch <= 'Z') | |
| 846 || (ch >= 'a' && ch <= 'z') | |
| 847 || ch == '{') | |
| 848 { | |
| 849 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 850 "the parameters in the \"%%name\" form are not supported, " | |
| 851 "use the \"$variable\" instead"); | |
| 852 | |
| 853 return NGX_CONF_ERROR; | |
| 854 } | |
| 855 } | |
| 856 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
857 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
|
858 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
859 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
|
860 |
| 573 | 861 op = ngx_array_push(ops); |
| 501 | 862 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
|
863 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
|
864 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
865 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
866 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
|
867 |
| 880 | 868 if (value[s].data[i] == '$') { |
| 569 | 869 |
| 870 if (++i == value[s].len) { | |
| 871 goto invalid; | |
| 872 } | |
| 873 | |
| 874 if (value[s].data[i] == '{') { | |
| 875 bracket = 1; | |
| 876 | |
| 877 if (++i == value[s].len) { | |
| 878 goto invalid; | |
| 879 } | |
| 880 | |
| 881 var.data = &value[s].data[i]; | |
| 882 | |
| 883 } else { | |
| 884 bracket = 0; | |
| 885 var.data = &value[s].data[i]; | |
| 886 } | |
| 887 | |
| 888 for (var.len = 0; i < value[s].len; i++, var.len++) { | |
| 889 ch = value[s].data[i]; | |
| 890 | |
| 891 if (ch == '}' && bracket) { | |
| 892 i++; | |
| 893 bracket = 0; | |
| 894 break; | |
| 895 } | |
| 896 | |
| 897 if ((ch >= 'A' && ch <= 'Z') | |
| 898 || (ch >= 'a' && ch <= 'z') | |
| 899 || (ch >= '0' && ch <= '9') | |
| 900 || ch == '_') | |
| 901 { | |
| 902 continue; | |
| 903 } | |
| 904 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
905 break; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
906 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
907 |
| 569 | 908 if (bracket) { |
| 909 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 910 "the closing bracket in \"%V\" " | |
| 911 "variable is missing", &var); | |
| 912 return NGX_CONF_ERROR; | |
| 913 } | |
| 914 | |
| 915 if (var.len == 0) { | |
| 916 goto invalid; | |
| 917 } | |
| 918 | |
| 577 | 919 if (ngx_strncmp(var.data, "apache_bytes_sent", 17) == 0) { |
| 920 ngx_conf_log_error(NGX_LOG_WARN, cf, 0, | |
| 921 "use \"$body_bytes_sent\" instead of " | |
| 922 "\"$apache_bytes_sent\""); | |
| 923 } | |
| 924 | |
| 573 | 925 for (v = ngx_http_log_vars; v->name.len; v++) { |
| 926 | |
| 927 if (v->name.len == var.len | |
| 928 && ngx_strncmp(v->name.data, var.data, var.len) == 0) | |
| 929 { | |
| 930 op->len = v->len; | |
| 931 op->getlen = NULL; | |
| 932 op->run = v->run; | |
| 933 op->data = 0; | |
| 934 | |
| 935 goto found; | |
| 936 } | |
| 937 } | |
| 938 | |
| 569 | 939 if (ngx_http_log_variable_compile(cf, op, &var) != NGX_OK) { |
| 940 return NGX_CONF_ERROR; | |
| 941 } | |
| 942 | |
| 573 | 943 found: |
| 944 | |
| 945 continue; | |
| 946 } | |
| 947 | |
| 948 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
|
949 |
| 880 | 950 while (i < value[s].len && value[s].data[i] != '$') { |
| 573 | 951 i++; |
| 952 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
953 |
| 573 | 954 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
|
955 |
| 573 | 956 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
|
957 |
| 573 | 958 op->len = len; |
| 959 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
|
960 |
| 573 | 961 if (len <= sizeof(uintptr_t)) { |
| 962 op->run = ngx_http_log_copy_short; | |
| 963 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
|
964 |
| 573 | 965 while (len--) { |
| 966 op->data <<= 8; | |
| 967 op->data |= data[len]; | |
| 968 } | |
| 969 | |
| 970 } else { | |
| 971 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
|
972 |
| 573 | 973 p = ngx_palloc(cf->pool, len); |
| 974 if (p == NULL) { | |
| 975 return NGX_CONF_ERROR; | |
| 976 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
977 |
| 573 | 978 ngx_memcpy(p, data, len); |
| 979 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
|
980 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
981 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
982 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
983 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
984 |
| 569 | 985 return NGX_CONF_OK; |
| 986 | |
| 987 invalid: | |
| 988 | |
| 989 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%s\"", data); | |
| 990 | |
| 991 return NGX_CONF_ERROR; | |
| 992 } | |
| 993 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
994 |
| 569 | 995 static ngx_int_t |
| 573 | 996 ngx_http_log_init(ngx_conf_t *cf) |
| 569 | 997 { |
| 573 | 998 ngx_str_t *value; |
| 999 ngx_array_t a; | |
| 581 | 1000 ngx_http_handler_pt *h; |
| 573 | 1001 ngx_http_log_fmt_t *fmt; |
| 1002 ngx_http_log_main_conf_t *lmcf; | |
| 569 | 1003 ngx_http_core_main_conf_t *cmcf; |
| 1004 | |
| 573 | 1005 lmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_log_module); |
| 1006 | |
| 1007 if (lmcf->combined_used) { | |
| 1008 if (ngx_array_init(&a, cf->pool, 1, sizeof(ngx_str_t)) != NGX_OK) { | |
| 1009 return NGX_ERROR; | |
| 1010 } | |
| 1011 | |
| 1012 value = ngx_array_push(&a); | |
| 1013 if (value == NULL) { | |
| 1014 return NGX_ERROR; | |
| 1015 } | |
| 1016 | |
| 1017 *value = ngx_http_combined_fmt; | |
| 1018 fmt = lmcf->formats.elts; | |
| 1019 | |
| 1020 if (ngx_http_log_compile_format(cf, fmt->ops, &a, 0) | |
| 1021 != NGX_CONF_OK) | |
| 1022 { | |
| 1023 return NGX_ERROR; | |
| 1024 } | |
| 1025 } | |
| 1026 | |
| 1027 cmcf = ngx_http_conf_get_module_main_conf(cf, ngx_http_core_module); | |
| 569 | 1028 |
| 581 | 1029 h = ngx_array_push(&cmcf->phases[NGX_HTTP_LOG_PHASE].handlers); |
| 1030 if (h == NULL) { | |
| 1031 return NGX_ERROR; | |
| 1032 } | |
| 1033 | |
| 1034 *h = ngx_http_log_handler; | |
| 569 | 1035 |
| 1036 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
|
1037 } |