Mercurial > hg > nginx
annotate src/stream/ngx_stream_log_module.c @ 6965:3ef4cadfad7f
Added support for "429 Too Many Requests" response (RFC6585).
This change adds reason phrase in status line and pretty response body
when "429" status code is used in "return", "limit_conn_status" and/or
"limit_req_status" directives.
Signed-off-by: Piotr Sikora <piotrsikora@google.com>
| author | Piotr Sikora <piotrsikora@google.com> |
|---|---|
| date | Fri, 24 Mar 2017 02:48:03 -0700 |
| parents | 3fb9b5eb75c0 |
| children | 265c29b0b8b8 |
| 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> |
| 6678 | 10 #include <ngx_stream.h> |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
11 |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
12 #if (NGX_ZLIB) |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
13 #include <zlib.h> |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
14 #endif |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
15 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
16 |
| 6678 | 17 typedef struct ngx_stream_log_op_s ngx_stream_log_op_t; |
| 880 | 18 |
| 6678 | 19 typedef u_char *(*ngx_stream_log_op_run_pt) (ngx_stream_session_t *s, |
| 20 u_char *buf, ngx_stream_log_op_t *op); | |
| 880 | 21 |
| 6678 | 22 typedef size_t (*ngx_stream_log_op_getlen_pt) (ngx_stream_session_t *s, |
| 880 | 23 uintptr_t data); |
| 24 | |
| 25 | |
| 6678 | 26 struct ngx_stream_log_op_s { |
| 27 size_t len; | |
| 28 ngx_stream_log_op_getlen_pt getlen; | |
| 29 ngx_stream_log_op_run_pt run; | |
| 30 uintptr_t data; | |
| 880 | 31 }; |
| 32 | |
| 573 | 33 |
| 34 typedef struct { | |
| 6678 | 35 ngx_str_t name; |
| 36 ngx_array_t *flushes; | |
| 37 ngx_array_t *ops; /* array of ngx_stream_log_op_t */ | |
| 38 } ngx_stream_log_fmt_t; | |
| 573 | 39 |
| 657 | 40 |
| 573 | 41 typedef struct { |
| 6678 | 42 ngx_array_t formats; /* array of ngx_stream_log_fmt_t */ |
| 43 } ngx_stream_log_main_conf_t; | |
| 573 | 44 |
| 657 | 45 |
| 573 | 46 typedef struct { |
| 6678 | 47 u_char *start; |
| 48 u_char *pos; | |
| 49 u_char *last; | |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
50 |
| 6678 | 51 ngx_event_t *event; |
| 52 ngx_msec_t flush; | |
| 53 ngx_int_t gzip; | |
| 54 } ngx_stream_log_buf_t; | |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
55 |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
56 |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
57 typedef struct { |
| 6678 | 58 ngx_array_t *lengths; |
| 59 ngx_array_t *values; | |
| 60 } ngx_stream_log_script_t; | |
| 2072 | 61 |
| 62 | |
| 63 typedef struct { | |
| 6678 | 64 ngx_open_file_t *file; |
| 65 ngx_stream_log_script_t *script; | |
| 66 time_t disk_full_time; | |
| 67 time_t error_log_time; | |
| 68 ngx_syslog_peer_t *syslog_peer; | |
| 69 ngx_stream_log_fmt_t *format; | |
| 70 ngx_stream_complex_value_t *filter; | |
| 71 } ngx_stream_log_t; | |
| 573 | 72 |
| 657 | 73 |
| 573 | 74 typedef struct { |
| 6678 | 75 ngx_array_t *logs; /* array of ngx_stream_log_t */ |
| 2072 | 76 |
| 6678 | 77 ngx_open_file_cache_t *open_file_cache; |
| 78 time_t open_file_cache_valid; | |
| 79 ngx_uint_t open_file_cache_min_uses; | |
| 2072 | 80 |
| 6678 | 81 ngx_uint_t off; /* unsigned off:1 */ |
| 82 } ngx_stream_log_srv_conf_t; | |
| 573 | 83 |
| 84 | |
| 85 typedef struct { | |
| 6678 | 86 ngx_str_t name; |
| 87 size_t len; | |
| 88 ngx_stream_log_op_run_pt run; | |
| 89 } ngx_stream_log_var_t; | |
| 573 | 90 |
| 91 | |
| 6678 | 92 static void ngx_stream_log_write(ngx_stream_session_t *s, ngx_stream_log_t *log, |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
93 u_char *buf, size_t len); |
| 6678 | 94 static ssize_t ngx_stream_log_script_write(ngx_stream_session_t *s, |
| 95 ngx_stream_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
|
96 |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
97 #if (NGX_ZLIB) |
| 6678 | 98 static ssize_t ngx_stream_log_gzip(ngx_fd_t fd, u_char *buf, size_t len, |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
99 ngx_int_t level, ngx_log_t *log); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
100 |
| 6678 | 101 static void *ngx_stream_log_gzip_alloc(void *opaque, u_int items, u_int size); |
| 102 static void ngx_stream_log_gzip_free(void *opaque, void *address); | |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
103 #endif |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
104 |
| 6678 | 105 static void ngx_stream_log_flush(ngx_open_file_t *file, ngx_log_t *log); |
| 106 static void ngx_stream_log_flush_handler(ngx_event_t *ev); | |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
107 |
| 6678 | 108 static ngx_int_t ngx_stream_log_variable_compile(ngx_conf_t *cf, |
|
6840
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
109 ngx_stream_log_op_t *op, ngx_str_t *value, ngx_uint_t json); |
| 6678 | 110 static size_t ngx_stream_log_variable_getlen(ngx_stream_session_t *s, |
| 501 | 111 uintptr_t data); |
| 6678 | 112 static u_char *ngx_stream_log_variable(ngx_stream_session_t *s, u_char *buf, |
| 113 ngx_stream_log_op_t *op); | |
| 114 static uintptr_t ngx_stream_log_escape(u_char *dst, u_char *src, size_t size); | |
|
6840
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
115 static size_t ngx_stream_log_json_variable_getlen(ngx_stream_session_t *s, |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
116 uintptr_t data); |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
117 static u_char *ngx_stream_log_json_variable(ngx_stream_session_t *s, |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
118 u_char *buf, ngx_stream_log_op_t *op); |
| 501 | 119 |
| 120 | |
| 6678 | 121 static void *ngx_stream_log_create_main_conf(ngx_conf_t *cf); |
| 122 static void *ngx_stream_log_create_srv_conf(ngx_conf_t *cf); | |
| 123 static char *ngx_stream_log_merge_srv_conf(ngx_conf_t *cf, void *parent, | |
| 497 | 124 void *child); |
| 6678 | 125 static char *ngx_stream_log_set_log(ngx_conf_t *cf, ngx_command_t *cmd, |
| 497 | 126 void *conf); |
| 6678 | 127 static char *ngx_stream_log_set_format(ngx_conf_t *cf, ngx_command_t *cmd, |
| 497 | 128 void *conf); |
| 6678 | 129 static char *ngx_stream_log_compile_format(ngx_conf_t *cf, |
| 2261 | 130 ngx_array_t *flushes, ngx_array_t *ops, ngx_array_t *args, ngx_uint_t s); |
| 6678 | 131 static char *ngx_stream_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, |
| 2072 | 132 void *conf); |
| 6678 | 133 static ngx_int_t ngx_stream_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
|
134 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
135 |
| 6678 | 136 static ngx_command_t ngx_stream_log_commands[] = { |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
137 |
| 497 | 138 { ngx_string("log_format"), |
| 6678 | 139 NGX_STREAM_MAIN_CONF|NGX_CONF_2MORE, |
| 140 ngx_stream_log_set_format, | |
| 141 NGX_STREAM_MAIN_CONF_OFFSET, | |
| 497 | 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 |
| 497 | 145 { ngx_string("access_log"), |
| 6678 | 146 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_1MORE, |
| 147 ngx_stream_log_set_log, | |
| 148 NGX_STREAM_SRV_CONF_OFFSET, | |
| 497 | 149 0, |
| 150 NULL }, | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
151 |
| 2072 | 152 { ngx_string("open_log_file_cache"), |
| 6678 | 153 NGX_STREAM_MAIN_CONF|NGX_STREAM_SRV_CONF|NGX_CONF_TAKE1234, |
| 154 ngx_stream_log_open_file_cache, | |
| 155 NGX_STREAM_SRV_CONF_OFFSET, | |
| 2072 | 156 0, |
| 157 NULL }, | |
| 158 | |
| 497 | 159 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
|
160 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
161 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
162 |
| 6678 | 163 static ngx_stream_module_t ngx_stream_log_module_ctx = { |
| 880 | 164 NULL, /* preconfiguration */ |
| 6678 | 165 ngx_stream_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
|
166 |
| 6678 | 167 ngx_stream_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
|
168 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
|
169 |
| 6678 | 170 ngx_stream_log_create_srv_conf, /* create server configuration */ |
| 171 ngx_stream_log_merge_srv_conf /* merge server configuration */ | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
172 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
173 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
174 |
| 6678 | 175 ngx_module_t ngx_stream_log_module = { |
| 509 | 176 NGX_MODULE_V1, |
| 6678 | 177 &ngx_stream_log_module_ctx, /* module context */ |
| 178 ngx_stream_log_commands, /* module directives */ | |
| 179 NGX_STREAM_MODULE, /* module type */ | |
| 541 | 180 NULL, /* init master */ |
| 573 | 181 NULL, /* init module */ |
| 541 | 182 NULL, /* init process */ |
| 183 NULL, /* init thread */ | |
| 184 NULL, /* exit thread */ | |
| 185 NULL, /* exit process */ | |
| 186 NULL, /* exit master */ | |
| 187 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
|
188 }; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
189 |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
190 |
| 6678 | 191 static ngx_int_t |
| 192 ngx_stream_log_handler(ngx_stream_session_t *s) | |
| 193 { | |
| 194 u_char *line, *p; | |
| 195 size_t len, size; | |
| 196 ssize_t n; | |
| 197 ngx_str_t val; | |
| 198 ngx_uint_t i, l; | |
| 199 ngx_stream_log_t *log; | |
| 200 ngx_stream_log_op_t *op; | |
| 201 ngx_stream_log_buf_t *buffer; | |
| 202 ngx_stream_log_srv_conf_t *lscf; | |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
203 |
| 6678 | 204 ngx_log_debug0(NGX_LOG_DEBUG_STREAM, s->connection->log, 0, |
| 205 "stream log handler"); | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
206 |
| 6678 | 207 lscf = ngx_stream_get_module_srv_conf(s, ngx_stream_log_module); |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
208 |
| 6678 | 209 if (lscf->off || lscf->logs == NULL) { |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
210 return NGX_OK; |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
211 } |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
212 |
| 6678 | 213 log = lscf->logs->elts; |
| 214 for (l = 0; l < lscf->logs->nelts; 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
|
215 |
|
5653
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
216 if (log[l].filter) { |
| 6678 | 217 if (ngx_stream_complex_value(s, log[l].filter, &val) != NGX_OK) { |
|
5653
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
218 return NGX_ERROR; |
|
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
219 } |
|
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
220 |
|
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
221 if (val.len == 0 || (val.len == 1 && val.data[0] == '0')) { |
|
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
222 continue; |
|
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
223 } |
|
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
224 } |
|
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
225 |
| 633 | 226 if (ngx_time() == log[l].disk_full_time) { |
| 227 | |
| 228 /* | |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
229 * on FreeBSD writing to a full filesystem with enabled softupdates |
| 633 | 230 * 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
|
231 * filesystem, so we skip writing to a log for one second |
| 633 | 232 */ |
| 233 | |
| 234 continue; | |
| 235 } | |
| 236 | |
| 6678 | 237 ngx_stream_script_flush_no_cacheable_variables(s, |
| 238 log[l].format->flushes); | |
| 2261 | 239 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
240 len = 0; |
| 2261 | 241 op = log[l].format->ops->elts; |
| 242 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
|
243 if (op[i].len == 0) { |
| 6678 | 244 len += op[i].getlen(s, 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
|
245 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
246 } else { |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
247 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
|
248 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
249 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
250 |
|
5702
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
251 if (log[l].syslog_peer) { |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
252 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
253 /* length of syslog's PRI and HEADER message parts */ |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
254 len += sizeof("<255>Jan 01 00:00:00 ") - 1 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
255 + ngx_cycle->hostname.len + 1 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
256 + log[l].syslog_peer->tag.len + 2; |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
257 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
258 goto alloc_line; |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
259 } |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
260 |
| 571 | 261 len += NGX_LINEFEED_SIZE; |
| 262 | |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
263 buffer = log[l].file ? log[l].file->data : NULL; |
| 571 | 264 |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
265 if (buffer) { |
| 571 | 266 |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
267 if (len > (size_t) (buffer->last - buffer->pos)) { |
| 571 | 268 |
| 6678 | 269 ngx_stream_log_write(s, &log[l], buffer->start, |
| 270 buffer->pos - buffer->start); | |
| 571 | 271 |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
272 buffer->pos = buffer->start; |
| 571 | 273 } |
| 274 | |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
275 if (len <= (size_t) (buffer->last - buffer->pos)) { |
| 571 | 276 |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
277 p = buffer->pos; |
| 571 | 278 |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
279 if (buffer->event && p == buffer->start) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
280 ngx_add_timer(buffer->event, buffer->flush); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
281 } |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
282 |
| 2261 | 283 for (i = 0; i < log[l].format->ops->nelts; i++) { |
| 6678 | 284 p = op[i].run(s, p, &op[i]); |
| 571 | 285 } |
| 286 | |
| 287 ngx_linefeed(p); | |
| 288 | |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
289 buffer->pos = p; |
| 571 | 290 |
| 291 continue; | |
| 292 } | |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
293 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
294 if (buffer->event && buffer->event->timer_set) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
295 ngx_del_timer(buffer->event); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
296 } |
| 571 | 297 } |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
298 |
|
5702
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
299 alloc_line: |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
300 |
| 6678 | 301 line = ngx_pnalloc(s->connection->pool, len); |
| 501 | 302 if (line == NULL) { |
| 473 | 303 return NGX_ERROR; |
| 304 } | |
| 305 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
306 p = line; |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
307 |
|
5702
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
308 if (log[l].syslog_peer) { |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
309 p = ngx_syslog_add_header(log[l].syslog_peer, line); |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
310 } |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
311 |
| 2261 | 312 for (i = 0; i < log[l].format->ops->nelts; i++) { |
| 6678 | 313 p = op[i].run(s, 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
|
314 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
315 |
|
5702
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
316 if (log[l].syslog_peer) { |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
317 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
318 size = p - line; |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
319 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
320 n = ngx_syslog_send(log[l].syslog_peer, line, size); |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
321 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
322 if (n < 0) { |
| 6678 | 323 ngx_log_error(NGX_LOG_WARN, s->connection->log, 0, |
|
5702
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
324 "send() to syslog failed"); |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
325 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
326 } else if ((size_t) n != size) { |
| 6678 | 327 ngx_log_error(NGX_LOG_WARN, s->connection->log, 0, |
|
5702
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
328 "send() to syslog has written only %z of %uz", |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
329 n, size); |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
330 } |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
331 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
332 continue; |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
333 } |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
334 |
| 571 | 335 ngx_linefeed(p); |
| 336 | |
| 6678 | 337 ngx_stream_log_write(s, &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
|
338 } |
|
26
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
339 |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
340 return NGX_OK; |
|
53cb81681040
nginx-0.0.1-2002-12-15-09:25:09 import
Igor Sysoev <igor@sysoev.ru>
parents:
diff
changeset
|
341 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
342 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
343 |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
344 static void |
| 6678 | 345 ngx_stream_log_write(ngx_stream_session_t *s, ngx_stream_log_t *log, |
| 346 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
|
347 { |
| 6678 | 348 u_char *name; |
| 349 time_t now; | |
| 350 ssize_t n; | |
| 351 ngx_err_t err; | |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
352 #if (NGX_ZLIB) |
| 6678 | 353 ngx_stream_log_buf_t *buffer; |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
354 #endif |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
355 |
| 2072 | 356 if (log->script == NULL) { |
| 357 name = log->file->name.data; | |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
358 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
359 #if (NGX_ZLIB) |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
360 buffer = log->file->data; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
361 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
362 if (buffer && buffer->gzip) { |
| 6678 | 363 n = ngx_stream_log_gzip(log->file->fd, buf, len, buffer->gzip, |
| 364 s->connection->log); | |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
365 } else { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
366 n = ngx_write_fd(log->file->fd, buf, len); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
367 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
368 #else |
| 2072 | 369 n = ngx_write_fd(log->file->fd, buf, len); |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
370 #endif |
| 2072 | 371 |
| 372 } else { | |
| 373 name = NULL; | |
| 6678 | 374 n = ngx_stream_log_script_write(s, log->script, &name, buf, len); |
| 2072 | 375 } |
|
1071
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
376 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
377 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
|
378 return; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
379 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
380 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
381 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
|
382 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
383 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
|
384 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
|
385 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
386 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
|
387 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
|
388 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
389 |
|
1161
6002e0253221
use 60 seconds interval but not 61 seconds
Igor Sysoev <igor@sysoev.ru>
parents:
1074
diff
changeset
|
390 if (now - log->error_log_time > 59) { |
| 6678 | 391 ngx_log_error(NGX_LOG_ALERT, s->connection->log, err, |
| 2072 | 392 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
|
393 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
394 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
|
395 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
396 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
397 return; |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
398 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
399 |
|
1161
6002e0253221
use 60 seconds interval but not 61 seconds
Igor Sysoev <igor@sysoev.ru>
parents:
1074
diff
changeset
|
400 if (now - log->error_log_time > 59) { |
| 6678 | 401 ngx_log_error(NGX_LOG_ALERT, s->connection->log, 0, |
| 2072 | 402 ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz", |
| 403 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
|
404 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
405 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
|
406 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
407 } |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
408 |
|
bd4202f92581
log a failure of the writing to access_log once per minute
Igor Sysoev <igor@sysoev.ru>
parents:
905
diff
changeset
|
409 |
| 2072 | 410 static ssize_t |
| 6678 | 411 ngx_stream_log_script_write(ngx_stream_session_t *s, |
| 412 ngx_stream_log_script_t *script, u_char **name, u_char *buf, size_t len) | |
| 2072 | 413 { |
| 6678 | 414 ssize_t n; |
| 415 ngx_str_t log; | |
| 416 ngx_open_file_info_t of; | |
| 417 ngx_stream_log_srv_conf_t *lscf; | |
|
4494
13e09cf11d4e
Disable symlinks: initialization of the "disable_symlinks" field in
Valentin Bartenev <vbart@nginx.com>
parents:
4478
diff
changeset
|
418 |
| 6678 | 419 if (ngx_stream_script_run(s, &log, script->lengths->elts, 1, |
| 420 script->values->elts) | |
| 2072 | 421 == NULL) |
| 422 { | |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
423 /* simulate successful logging */ |
| 2072 | 424 return len; |
| 425 } | |
| 426 | |
| 427 log.data[log.len - 1] = '\0'; | |
| 428 *name = log.data; | |
| 429 | |
| 6678 | 430 ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0, |
| 431 "stream log \"%s\"", log.data); | |
| 2072 | 432 |
| 6678 | 433 lscf = ngx_stream_get_module_srv_conf(s, ngx_stream_log_module); |
| 2072 | 434 |
| 435 ngx_memzero(&of, sizeof(ngx_open_file_info_t)); | |
| 436 | |
| 437 of.log = 1; | |
| 6678 | 438 of.valid = lscf->open_file_cache_valid; |
| 439 of.min_uses = lscf->open_file_cache_min_uses; | |
| 2277 | 440 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
|
441 |
| 6678 | 442 if (ngx_open_cached_file(lscf->open_file_cache, &log, &of, |
| 443 s->connection->pool) | |
| 2072 | 444 != NGX_OK) |
| 445 { | |
|
6948
3fb9b5eb75c0
Fixed ngx_open_cached_file() error handling.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6927
diff
changeset
|
446 if (of.err == 0) { |
|
3fb9b5eb75c0
Fixed ngx_open_cached_file() error handling.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6927
diff
changeset
|
447 /* simulate successful logging */ |
|
3fb9b5eb75c0
Fixed ngx_open_cached_file() error handling.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6927
diff
changeset
|
448 return len; |
|
3fb9b5eb75c0
Fixed ngx_open_cached_file() error handling.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6927
diff
changeset
|
449 } |
|
3fb9b5eb75c0
Fixed ngx_open_cached_file() error handling.
Sergey Kandaurov <pluknet@nginx.com>
parents:
6927
diff
changeset
|
450 |
| 6678 | 451 ngx_log_error(NGX_LOG_CRIT, s->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
|
452 "%s \"%s\" failed", of.failed, log.data); |
|
4499
778ef9c3fd2d
Fixed spelling in single-line comments.
Ruslan Ermilov <ru@nginx.com>
parents:
4494
diff
changeset
|
453 /* simulate successful logging */ |
| 2077 | 454 return len; |
| 2072 | 455 } |
| 456 | |
| 6678 | 457 ngx_log_debug1(NGX_LOG_DEBUG_STREAM, s->connection->log, 0, |
| 458 "stream log #%d", of.fd); | |
| 2072 | 459 |
| 460 n = ngx_write_fd(of.fd, buf, len); | |
| 461 | |
| 462 return n; | |
| 463 } | |
| 464 | |
| 465 | |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
466 #if (NGX_ZLIB) |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
467 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
468 static ssize_t |
| 6678 | 469 ngx_stream_log_gzip(ngx_fd_t fd, u_char *buf, size_t len, ngx_int_t level, |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
470 ngx_log_t *log) |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
471 { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
472 int rc, wbits, memlevel; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
473 u_char *out; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
474 size_t size; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
475 ssize_t n; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
476 z_stream zstream; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
477 ngx_err_t err; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
478 ngx_pool_t *pool; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
479 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
480 wbits = MAX_WBITS; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
481 memlevel = MAX_MEM_LEVEL - 1; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
482 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
483 while ((ssize_t) len < ((1 << (wbits - 1)) - 262)) { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
484 wbits--; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
485 memlevel--; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
486 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
487 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
488 /* |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
489 * This is a formula from deflateBound() for conservative upper bound of |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
490 * compressed data plus 18 bytes of gzip wrapper. |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
491 */ |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
492 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
493 size = len + ((len + 7) >> 3) + ((len + 63) >> 6) + 5 + 18; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
494 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
495 ngx_memzero(&zstream, sizeof(z_stream)); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
496 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
497 pool = ngx_create_pool(256, log); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
498 if (pool == NULL) { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
499 /* simulate successful logging */ |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
500 return len; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
501 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
502 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
503 pool->log = log; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
504 |
| 6678 | 505 zstream.zalloc = ngx_stream_log_gzip_alloc; |
| 506 zstream.zfree = ngx_stream_log_gzip_free; | |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
507 zstream.opaque = pool; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
508 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
509 out = ngx_pnalloc(pool, size); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
510 if (out == NULL) { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
511 goto done; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
512 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
513 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
514 zstream.next_in = buf; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
515 zstream.avail_in = len; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
516 zstream.next_out = out; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
517 zstream.avail_out = size; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
518 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
519 rc = deflateInit2(&zstream, (int) level, Z_DEFLATED, wbits + 16, memlevel, |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
520 Z_DEFAULT_STRATEGY); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
521 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
522 if (rc != Z_OK) { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
523 ngx_log_error(NGX_LOG_ALERT, log, 0, "deflateInit2() failed: %d", rc); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
524 goto done; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
525 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
526 |
| 6678 | 527 ngx_log_debug4(NGX_LOG_DEBUG_STREAM, log, 0, |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
528 "deflate in: ni:%p no:%p ai:%ud ao:%ud", |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
529 zstream.next_in, zstream.next_out, |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
530 zstream.avail_in, zstream.avail_out); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
531 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
532 rc = deflate(&zstream, Z_FINISH); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
533 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
534 if (rc != Z_STREAM_END) { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
535 ngx_log_error(NGX_LOG_ALERT, log, 0, |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
536 "deflate(Z_FINISH) failed: %d", rc); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
537 goto done; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
538 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
539 |
| 6678 | 540 ngx_log_debug5(NGX_LOG_DEBUG_STREAM, log, 0, |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
541 "deflate out: ni:%p no:%p ai:%ud ao:%ud rc:%d", |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
542 zstream.next_in, zstream.next_out, |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
543 zstream.avail_in, zstream.avail_out, |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
544 rc); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
545 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
546 size -= zstream.avail_out; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
547 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
548 rc = deflateEnd(&zstream); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
549 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
550 if (rc != Z_OK) { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
551 ngx_log_error(NGX_LOG_ALERT, log, 0, "deflateEnd() failed: %d", rc); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
552 goto done; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
553 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
554 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
555 n = ngx_write_fd(fd, out, size); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
556 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
557 if (n != (ssize_t) size) { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
558 err = (n == -1) ? ngx_errno : 0; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
559 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
560 ngx_destroy_pool(pool); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
561 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
562 ngx_set_errno(err); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
563 return -1; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
564 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
565 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
566 done: |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
567 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
568 ngx_destroy_pool(pool); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
569 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
570 /* simulate successful logging */ |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
571 return len; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
572 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
573 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
574 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
575 static void * |
| 6678 | 576 ngx_stream_log_gzip_alloc(void *opaque, u_int items, u_int size) |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
577 { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
578 ngx_pool_t *pool = opaque; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
579 |
| 6678 | 580 ngx_log_debug2(NGX_LOG_DEBUG_STREAM, pool->log, 0, |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
581 "gzip alloc: n:%ud s:%ud", items, size); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
582 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
583 return ngx_palloc(pool, items * size); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
584 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
585 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
586 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
587 static void |
| 6678 | 588 ngx_stream_log_gzip_free(void *opaque, void *address) |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
589 { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
590 #if 0 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
591 ngx_pool_t *pool = opaque; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
592 |
| 6678 | 593 ngx_log_debug1(NGX_LOG_DEBUG_STREAM, pool->log, 0, |
| 594 "gzip free: %p", address); | |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
595 #endif |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
596 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
597 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
598 #endif |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
599 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
600 |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
601 static void |
| 6678 | 602 ngx_stream_log_flush(ngx_open_file_t *file, ngx_log_t *log) |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
603 { |
| 6678 | 604 size_t len; |
| 605 ssize_t n; | |
| 606 ngx_stream_log_buf_t *buffer; | |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
607 |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
608 buffer = file->data; |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
609 |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
610 len = buffer->pos - buffer->start; |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
611 |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
612 if (len == 0) { |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
613 return; |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
614 } |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
615 |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
616 #if (NGX_ZLIB) |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
617 if (buffer->gzip) { |
| 6678 | 618 n = ngx_stream_log_gzip(file->fd, buffer->start, len, buffer->gzip, |
| 619 log); | |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
620 } else { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
621 n = ngx_write_fd(file->fd, buffer->start, len); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
622 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
623 #else |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
624 n = ngx_write_fd(file->fd, buffer->start, len); |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
625 #endif |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
626 |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
627 if (n == -1) { |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
628 ngx_log_error(NGX_LOG_ALERT, log, ngx_errno, |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
629 ngx_write_fd_n " to \"%s\" failed", |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
630 file->name.data); |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
631 |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
632 } else if ((size_t) n != len) { |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
633 ngx_log_error(NGX_LOG_ALERT, log, 0, |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
634 ngx_write_fd_n " to \"%s\" was incomplete: %z of %uz", |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
635 file->name.data, n, len); |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
636 } |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
637 |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
638 buffer->pos = buffer->start; |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
639 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
640 if (buffer->event && buffer->event->timer_set) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
641 ngx_del_timer(buffer->event); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
642 } |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
643 } |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
644 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
645 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
646 static void |
| 6678 | 647 ngx_stream_log_flush_handler(ngx_event_t *ev) |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
648 { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
649 ngx_log_debug0(NGX_LOG_DEBUG_EVENT, ev->log, 0, |
| 6678 | 650 "stream log buffer flush handler"); |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
651 |
|
6927
c36d160cd4e0
Access log: removed dead ev->timedout check in flush timer handler.
Maxim Dounin <mdounin@mdounin.ru>
parents:
6840
diff
changeset
|
652 ngx_stream_log_flush(ev->data, ev->log); |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
653 } |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
654 |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
655 |
| 497 | 656 static u_char * |
| 6678 | 657 ngx_stream_log_copy_short(ngx_stream_session_t *s, u_char *buf, |
| 658 ngx_stream_log_op_t *op) | |
| 479 | 659 { |
| 660 size_t len; | |
| 661 uintptr_t data; | |
| 662 | |
| 663 len = op->len; | |
| 664 data = op->data; | |
| 665 | |
| 666 while (len--) { | |
| 667 *buf++ = (u_char) (data & 0xff); | |
| 668 data >>= 8; | |
| 669 } | |
| 670 | |
| 671 return buf; | |
| 672 } | |
| 673 | |
| 674 | |
| 497 | 675 static u_char * |
| 6678 | 676 ngx_stream_log_copy_long(ngx_stream_session_t *s, u_char *buf, |
| 677 ngx_stream_log_op_t *op) | |
| 479 | 678 { |
| 679 return ngx_cpymem(buf, (u_char *) op->data, op->len); | |
| 680 } | |
| 681 | |
| 682 | |
| 497 | 683 static ngx_int_t |
| 6678 | 684 ngx_stream_log_variable_compile(ngx_conf_t *cf, ngx_stream_log_op_t *op, |
|
6840
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
685 ngx_str_t *value, ngx_uint_t json) |
| 501 | 686 { |
| 509 | 687 ngx_int_t index; |
| 501 | 688 |
| 6678 | 689 index = ngx_stream_get_variable_index(cf, value); |
| 509 | 690 if (index == NGX_ERROR) { |
| 501 | 691 return NGX_ERROR; |
| 692 } | |
| 693 | |
| 694 op->len = 0; | |
|
6840
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
695 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
696 if (json) { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
697 op->getlen = ngx_stream_log_json_variable_getlen; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
698 op->run = ngx_stream_log_json_variable; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
699 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
700 } else { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
701 op->getlen = ngx_stream_log_variable_getlen; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
702 op->run = ngx_stream_log_variable; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
703 } |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
704 |
| 509 | 705 op->data = index; |
| 501 | 706 |
| 707 return NGX_OK; | |
| 708 } | |
| 709 | |
| 710 | |
| 711 static size_t | |
| 6678 | 712 ngx_stream_log_variable_getlen(ngx_stream_session_t *s, uintptr_t data) |
| 501 | 713 { |
| 6678 | 714 uintptr_t len; |
| 715 ngx_stream_variable_value_t *value; | |
| 501 | 716 |
| 6678 | 717 value = ngx_stream_get_indexed_variable(s, data); |
| 501 | 718 |
| 573 | 719 if (value == NULL || value->not_found) { |
| 501 | 720 return 1; |
| 721 } | |
| 722 | |
| 6678 | 723 len = ngx_stream_log_escape(NULL, value->data, value->len); |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
724 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
725 value->escape = len ? 1 : 0; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
726 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
727 return value->len + len * 3; |
| 501 | 728 } |
| 729 | |
| 730 | |
| 731 static u_char * | |
| 6678 | 732 ngx_stream_log_variable(ngx_stream_session_t *s, u_char *buf, |
| 733 ngx_stream_log_op_t *op) | |
| 501 | 734 { |
| 6678 | 735 ngx_stream_variable_value_t *value; |
| 501 | 736 |
| 6678 | 737 value = ngx_stream_get_indexed_variable(s, op->data); |
| 501 | 738 |
| 573 | 739 if (value == NULL || value->not_found) { |
| 501 | 740 *buf = '-'; |
| 741 return buf + 1; | |
| 742 } | |
| 743 | |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
744 if (value->escape == 0) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
745 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
|
746 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
747 } else { |
| 6678 | 748 return (u_char *) ngx_stream_log_escape(buf, value->data, value->len); |
|
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 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
752 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
753 static uintptr_t |
| 6678 | 754 ngx_stream_log_escape(u_char *dst, u_char *src, size_t size) |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
755 { |
| 3275 | 756 ngx_uint_t n; |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
757 static u_char hex[] = "0123456789ABCDEF"; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
758 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
759 static uint32_t escape[] = { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
760 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
|
761 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
762 /* ?>=< ;:98 7654 3210 /.-, +*)( '&%$ #"! */ |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
763 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
|
764 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
765 /* _^]\ [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
|
766 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
|
767 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
768 /* ~}| {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
|
769 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
|
770 |
|
4191
08d8af70760c
Improved access log escaping to better protect other software.
Maxim Dounin <mdounin@mdounin.ru>
parents:
4133
diff
changeset
|
771 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
|
772 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
|
773 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
|
774 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
|
775 }; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
776 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
777 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
778 if (dst == NULL) { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
779 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
780 /* 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
|
781 |
| 3115 | 782 n = 0; |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
783 |
| 3275 | 784 while (size) { |
|
6626
b3682580c1bd
Avoid left-shifting integers into the sign bit, which is undefined.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5927
diff
changeset
|
785 if (escape[*src >> 5] & (1U << (*src & 0x1f))) { |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
786 n++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
787 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
788 src++; |
| 3275 | 789 size--; |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
790 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
791 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
792 return (uintptr_t) n; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
793 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
794 |
| 3275 | 795 while (size) { |
|
6626
b3682580c1bd
Avoid left-shifting integers into the sign bit, which is undefined.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5927
diff
changeset
|
796 if (escape[*src >> 5] & (1U << (*src & 0x1f))) { |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
797 *dst++ = '\\'; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
798 *dst++ = 'x'; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
799 *dst++ = hex[*src >> 4]; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
800 *dst++ = hex[*src & 0xf]; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
801 src++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
802 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
803 } else { |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
804 *dst++ = *src++; |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
805 } |
| 3275 | 806 size--; |
|
2008
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
807 } |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
808 |
|
66dc85397a90
escape 0x00-0x1f, ", and \ in access log variables
Igor Sysoev <igor@sysoev.ru>
parents:
1640
diff
changeset
|
809 return (uintptr_t) dst; |
| 501 | 810 } |
| 811 | |
| 812 | |
|
6840
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
813 static size_t |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
814 ngx_stream_log_json_variable_getlen(ngx_stream_session_t *s, uintptr_t data) |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
815 { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
816 uintptr_t len; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
817 ngx_stream_variable_value_t *value; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
818 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
819 value = ngx_stream_get_indexed_variable(s, data); |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
820 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
821 if (value == NULL || value->not_found) { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
822 return 0; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
823 } |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
824 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
825 len = ngx_escape_json(NULL, value->data, value->len); |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
826 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
827 value->escape = len ? 1 : 0; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
828 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
829 return value->len + len; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
830 } |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
831 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
832 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
833 static u_char * |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
834 ngx_stream_log_json_variable(ngx_stream_session_t *s, u_char *buf, |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
835 ngx_stream_log_op_t *op) |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
836 { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
837 ngx_stream_variable_value_t *value; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
838 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
839 value = ngx_stream_get_indexed_variable(s, op->data); |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
840 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
841 if (value == NULL || value->not_found) { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
842 return buf; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
843 } |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
844 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
845 if (value->escape == 0) { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
846 return ngx_cpymem(buf, value->data, value->len); |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
847 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
848 } else { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
849 return (u_char *) ngx_escape_json(buf, value->data, value->len); |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
850 } |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
851 } |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
852 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
853 |
| 497 | 854 static void * |
| 6678 | 855 ngx_stream_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
|
856 { |
| 6678 | 857 ngx_stream_log_main_conf_t *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
|
858 |
| 6678 | 859 conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_log_main_conf_t)); |
| 501 | 860 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
|
861 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
|
862 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
863 |
| 6678 | 864 if (ngx_array_init(&conf->formats, cf->pool, 4, |
| 865 sizeof(ngx_stream_log_fmt_t)) | |
| 573 | 866 != NGX_OK) |
| 497 | 867 { |
|
2912
c7d57b539248
return NULL instead of NGX_CONF_ERROR on a create conf failure
Igor Sysoev <igor@sysoev.ru>
parents:
2756
diff
changeset
|
868 return NULL; |
| 497 | 869 } |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
870 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
871 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
|
872 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
873 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
874 |
| 497 | 875 static void * |
| 6678 | 876 ngx_stream_log_create_srv_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
|
877 { |
| 6678 | 878 ngx_stream_log_srv_conf_t *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
|
879 |
| 6678 | 880 conf = ngx_pcalloc(cf->pool, sizeof(ngx_stream_log_srv_conf_t)); |
| 501 | 881 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
|
882 return NULL; |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
883 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
884 |
| 2072 | 885 conf->open_file_cache = NGX_CONF_UNSET_PTR; |
| 886 | |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
887 return conf; |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
888 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
889 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
890 |
| 497 | 891 static char * |
| 6678 | 892 ngx_stream_log_merge_srv_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
|
893 { |
| 6678 | 894 ngx_stream_log_srv_conf_t *prev = parent; |
| 895 ngx_stream_log_srv_conf_t *conf = child; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
896 |
| 2072 | 897 if (conf->open_file_cache == NGX_CONF_UNSET_PTR) { |
| 898 | |
| 899 conf->open_file_cache = prev->open_file_cache; | |
| 900 conf->open_file_cache_valid = prev->open_file_cache_valid; | |
| 901 conf->open_file_cache_min_uses = prev->open_file_cache_min_uses; | |
| 902 | |
| 903 if (conf->open_file_cache == NGX_CONF_UNSET_PTR) { | |
| 904 conf->open_file_cache = NULL; | |
| 905 } | |
| 906 } | |
| 907 | |
| 1074 | 908 if (conf->logs || conf->off) { |
| 909 return NGX_CONF_OK; | |
| 910 } | |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
911 |
|
2078
9acbc5e7bcbd
fix variable access_log merging
Igor Sysoev <igor@sysoev.ru>
parents:
2077
diff
changeset
|
912 conf->logs = prev->logs; |
|
9acbc5e7bcbd
fix variable access_log merging
Igor Sysoev <igor@sysoev.ru>
parents:
2077
diff
changeset
|
913 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
|
914 |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
915 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
|
916 } |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
917 |
|
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
918 |
| 497 | 919 static char * |
| 6678 | 920 ngx_stream_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
|
921 { |
| 6678 | 922 ngx_stream_log_srv_conf_t *lscf = conf; |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
923 |
| 6678 | 924 ssize_t size; |
| 925 ngx_int_t gzip; | |
| 926 ngx_uint_t i, n; | |
| 927 ngx_msec_t flush; | |
| 928 ngx_str_t *value, name, s; | |
| 929 ngx_stream_log_t *log; | |
| 930 ngx_syslog_peer_t *peer; | |
| 931 ngx_stream_log_buf_t *buffer; | |
| 932 ngx_stream_log_fmt_t *fmt; | |
| 933 ngx_stream_script_compile_t sc; | |
| 934 ngx_stream_log_main_conf_t *lmcf; | |
| 935 ngx_stream_compile_complex_value_t ccv; | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
936 |
|
427
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
937 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
|
938 |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
939 if (ngx_strcmp(value[1].data, "off") == 0) { |
| 6678 | 940 lscf->off = 1; |
|
3038
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
941 if (cf->args->nelts == 2) { |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
942 return NGX_CONF_OK; |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
943 } |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
944 |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
945 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
946 "invalid parameter \"%V\"", &value[2]); |
|
cd8738e76610
strict testing "access_log off"
Igor Sysoev <igor@sysoev.ru>
parents:
2912
diff
changeset
|
947 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
|
948 } |
|
0d08eabe5c7b
nginx-0.0.10-2004-09-15-20:00:43 import
Igor Sysoev <igor@sysoev.ru>
parents:
415
diff
changeset
|
949 |
| 6678 | 950 if (lscf->logs == NULL) { |
| 951 lscf->logs = ngx_array_create(cf->pool, 2, sizeof(ngx_stream_log_t)); | |
| 952 if (lscf->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
|
953 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
|
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 } |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
956 |
| 6678 | 957 lmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_log_module); |
|
99
a059e1aa65d4
nginx-0.0.1-2003-06-02-19:24:30 import
Igor Sysoev <igor@sysoev.ru>
parents:
69
diff
changeset
|
958 |
| 6678 | 959 log = ngx_array_push(lscf->logs); |
| 501 | 960 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
|
961 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
|
962 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
963 |
| 6678 | 964 ngx_memzero(log, sizeof(ngx_stream_log_t)); |
| 2072 | 965 |
|
5702
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
966 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
967 if (ngx_strncmp(value[1].data, "syslog:", 7) == 0) { |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
968 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
969 peer = ngx_pcalloc(cf->pool, sizeof(ngx_syslog_peer_t)); |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
970 if (peer == NULL) { |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
971 return NGX_CONF_ERROR; |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
972 } |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
973 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
974 if (ngx_syslog_process_conf(cf, peer) != NGX_CONF_OK) { |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
975 return NGX_CONF_ERROR; |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
976 } |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
977 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
978 log->syslog_peer = peer; |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
979 |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
980 goto process_formats; |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
981 } |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
982 |
| 6678 | 983 n = ngx_stream_script_variables_count(&value[1]); |
| 2072 | 984 |
| 985 if (n == 0) { | |
| 986 log->file = ngx_conf_open_file(cf->cycle, &value[1]); | |
| 987 if (log->file == NULL) { | |
| 988 return NGX_CONF_ERROR; | |
| 989 } | |
| 990 | |
| 991 } else { | |
|
5330
314c3d7cc3a5
Backed out f1a91825730a and 7094bd12c1ff.
Maxim Dounin <mdounin@mdounin.ru>
parents:
5317
diff
changeset
|
992 if (ngx_conf_full_name(cf->cycle, &value[1], 0) != NGX_OK) { |
| 2072 | 993 return NGX_CONF_ERROR; |
| 994 } | |
| 995 | |
| 6678 | 996 log->script = ngx_pcalloc(cf->pool, sizeof(ngx_stream_log_script_t)); |
| 2072 | 997 if (log->script == NULL) { |
| 998 return NGX_CONF_ERROR; | |
| 999 } | |
| 1000 | |
| 6678 | 1001 ngx_memzero(&sc, sizeof(ngx_stream_script_compile_t)); |
| 2072 | 1002 |
| 1003 sc.cf = cf; | |
| 1004 sc.source = &value[1]; | |
| 1005 sc.lengths = &log->script->lengths; | |
| 1006 sc.values = &log->script->values; | |
| 1007 sc.variables = n; | |
| 1008 sc.complete_lengths = 1; | |
| 1009 sc.complete_values = 1; | |
| 1010 | |
| 6678 | 1011 if (ngx_stream_script_compile(&sc) != NGX_OK) { |
| 2072 | 1012 return NGX_CONF_ERROR; |
| 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 |
|
5702
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
1016 process_formats: |
|
777202558122
Added syslog support for error_log and access_log directives.
Vladimir Homutov <vl@nginx.com>
parents:
5653
diff
changeset
|
1017 |
| 571 | 1018 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
|
1019 name = value[2]; |
| 581 | 1020 |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1021 } else { |
| 6678 | 1022 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 1023 "log format is not specified"); | |
| 1024 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
|
1025 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1026 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1027 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
|
1028 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
|
1029 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
|
1030 && 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
|
1031 { |
| 2261 | 1032 log->format = &fmt[i]; |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1033 break; |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1034 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1035 } |
|
100
7ebc8b7fb816
nginx-0.0.1-2003-06-03-19:42:58 import
Igor Sysoev <igor@sysoev.ru>
parents:
99
diff
changeset
|
1036 |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1037 if (log->format == NULL) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1038 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1039 "unknown log format \"%V\"", &name); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1040 return NGX_CONF_ERROR; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1041 } |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1042 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1043 size = 0; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1044 flush = 0; |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1045 gzip = 0; |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1046 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1047 for (i = 3; i < cf->args->nelts; i++) { |
| 487 | 1048 |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1049 if (ngx_strncmp(value[i].data, "buffer=", 7) == 0) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1050 s.len = value[i].len - 7; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1051 s.data = value[i].data + 7; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1052 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1053 size = ngx_parse_size(&s); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1054 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1055 if (size == NGX_ERROR || size == 0) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1056 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1057 "invalid buffer size \"%V\"", &s); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1058 return NGX_CONF_ERROR; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1059 } |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1060 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1061 continue; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1062 } |
| 571 | 1063 |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1064 if (ngx_strncmp(value[i].data, "flush=", 6) == 0) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1065 s.len = value[i].len - 6; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1066 s.data = value[i].data + 6; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1067 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1068 flush = ngx_parse_time(&s, 0); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1069 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1070 if (flush == (ngx_msec_t) NGX_ERROR || flush == 0) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1071 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1072 "invalid flush time \"%V\"", &s); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1073 return NGX_CONF_ERROR; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1074 } |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1075 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1076 continue; |
| 571 | 1077 } |
| 1078 | |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1079 if (ngx_strncmp(value[i].data, "gzip", 4) == 0 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1080 && (value[i].len == 4 || value[i].data[4] == '=')) |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1081 { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1082 #if (NGX_ZLIB) |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1083 if (size == 0) { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1084 size = 64 * 1024; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1085 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1086 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1087 if (value[i].len == 4) { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1088 gzip = Z_BEST_SPEED; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1089 continue; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1090 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1091 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1092 s.len = value[i].len - 5; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1093 s.data = value[i].data + 5; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1094 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1095 gzip = ngx_atoi(s.data, s.len); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1096 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1097 if (gzip < 1 || gzip > 9) { |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1098 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1099 "invalid compression level \"%V\"", &s); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1100 return NGX_CONF_ERROR; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1101 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1102 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1103 continue; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1104 |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1105 #else |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1106 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1107 "nginx was built without zlib support"); |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1108 return NGX_CONF_ERROR; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1109 #endif |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1110 } |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1111 |
|
5653
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
1112 if (ngx_strncmp(value[i].data, "if=", 3) == 0) { |
|
5833
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1113 s.len = value[i].len - 3; |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1114 s.data = value[i].data + 3; |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1115 |
| 6678 | 1116 ngx_memzero(&ccv, sizeof(ngx_stream_compile_complex_value_t)); |
|
5833
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1117 |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1118 ccv.cf = cf; |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1119 ccv.value = &s; |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1120 ccv.complex_value = ngx_palloc(cf->pool, |
| 6678 | 1121 sizeof(ngx_stream_complex_value_t)); |
|
5833
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1122 if (ccv.complex_value == NULL) { |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1123 return NGX_CONF_ERROR; |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1124 } |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1125 |
| 6678 | 1126 if (ngx_stream_compile_complex_value(&ccv) != NGX_OK) { |
|
5833
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1127 return NGX_CONF_ERROR; |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1128 } |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1129 |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1130 log->filter = ccv.complex_value; |
|
e3016ee8dba3
Access log: fixed the "if=" parameter with buffering (ticket #625).
Valentin Bartenev <vbart@nginx.com>
parents:
5799
diff
changeset
|
1131 |
|
5653
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
1132 continue; |
|
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
1133 } |
|
cb308813b453
Access log: the "if" parameter of the "access_log" directive.
Sergey Kandaurov <pluknet@nginx.com>
parents:
5361
diff
changeset
|
1134 |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1135 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1136 "invalid parameter \"%V\"", &value[i]); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1137 return NGX_CONF_ERROR; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1138 } |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1139 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1140 if (flush && size == 0) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1141 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1142 "no buffer is defined for access_log \"%V\"", |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1143 &value[1]); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1144 return NGX_CONF_ERROR; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1145 } |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1146 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1147 if (size) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1148 |
| 2072 | 1149 if (log->script) { |
| 1150 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
|
1151 "buffered logs cannot have variables in name"); |
| 2072 | 1152 return NGX_CONF_ERROR; |
| 1153 } | |
| 1154 | |
|
5799
b1f8285297a7
Access log: allowed logs to syslog with "if=" (ticket #596).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5719
diff
changeset
|
1155 if (log->syslog_peer) { |
|
b1f8285297a7
Access log: allowed logs to syslog with "if=" (ticket #596).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5719
diff
changeset
|
1156 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
b1f8285297a7
Access log: allowed logs to syslog with "if=" (ticket #596).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5719
diff
changeset
|
1157 "logs to syslog cannot be buffered"); |
|
b1f8285297a7
Access log: allowed logs to syslog with "if=" (ticket #596).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5719
diff
changeset
|
1158 return NGX_CONF_ERROR; |
|
b1f8285297a7
Access log: allowed logs to syslog with "if=" (ticket #596).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5719
diff
changeset
|
1159 } |
|
b1f8285297a7
Access log: allowed logs to syslog with "if=" (ticket #596).
Maxim Dounin <mdounin@mdounin.ru>
parents:
5719
diff
changeset
|
1160 |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1161 if (log->file->data) { |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1162 buffer = log->file->data; |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1163 |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1164 if (buffer->last - buffer->start != size |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1165 || buffer->flush != flush |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1166 || buffer->gzip != gzip) |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1167 { |
|
4984
7737f0d788c1
Access log: fixed redundant buffer reallocation.
Valentin Bartenev <vbart@nginx.com>
parents:
4893
diff
changeset
|
1168 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
7737f0d788c1
Access log: fixed redundant buffer reallocation.
Valentin Bartenev <vbart@nginx.com>
parents:
4893
diff
changeset
|
1169 "access_log \"%V\" already defined " |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1170 "with conflicting parameters", |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1171 &value[1]); |
|
4984
7737f0d788c1
Access log: fixed redundant buffer reallocation.
Valentin Bartenev <vbart@nginx.com>
parents:
4893
diff
changeset
|
1172 return NGX_CONF_ERROR; |
|
7737f0d788c1
Access log: fixed redundant buffer reallocation.
Valentin Bartenev <vbart@nginx.com>
parents:
4893
diff
changeset
|
1173 } |
|
7737f0d788c1
Access log: fixed redundant buffer reallocation.
Valentin Bartenev <vbart@nginx.com>
parents:
4893
diff
changeset
|
1174 |
|
7737f0d788c1
Access log: fixed redundant buffer reallocation.
Valentin Bartenev <vbart@nginx.com>
parents:
4893
diff
changeset
|
1175 return NGX_CONF_OK; |
| 571 | 1176 } |
| 1177 | |
| 6678 | 1178 buffer = ngx_pcalloc(cf->pool, sizeof(ngx_stream_log_buf_t)); |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1179 if (buffer == NULL) { |
| 571 | 1180 return NGX_CONF_ERROR; |
| 1181 } | |
| 1182 | |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1183 buffer->start = ngx_pnalloc(cf->pool, size); |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1184 if (buffer->start == NULL) { |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1185 return NGX_CONF_ERROR; |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1186 } |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1187 |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1188 buffer->pos = buffer->start; |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1189 buffer->last = buffer->start + size; |
|
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1190 |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1191 if (flush) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1192 buffer->event = ngx_pcalloc(cf->pool, sizeof(ngx_event_t)); |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1193 if (buffer->event == NULL) { |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1194 return NGX_CONF_ERROR; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1195 } |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1196 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1197 buffer->event->data = log->file; |
| 6678 | 1198 buffer->event->handler = ngx_stream_log_flush_handler; |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1199 buffer->event->log = &cf->cycle->new_log; |
|
5897
dff86e2246a5
Access log: cancel the flush timer on graceful shutdown.
Valentin Bartenev <vbart@nginx.com>
parents:
5833
diff
changeset
|
1200 buffer->event->cancelable = 1; |
|
4986
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1201 |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1202 buffer->flush = flush; |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1203 } |
|
3efc49b156d9
Access log: the "flush" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4985
diff
changeset
|
1204 |
|
4988
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1205 buffer->gzip = gzip; |
|
3849bb380605
Access log: the "gzip" parameter of the "access_log" directive.
Valentin Bartenev <vbart@nginx.com>
parents:
4986
diff
changeset
|
1206 |
| 6678 | 1207 log->file->flush = ngx_stream_log_flush; |
|
4985
a0599b56e748
Reopening log files code moved to a separate function.
Valentin Bartenev <vbart@nginx.com>
parents:
4984
diff
changeset
|
1208 log->file->data = buffer; |
| 571 | 1209 } |
| 1210 | |
| 1211 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
|
1212 } |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1213 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1214 |
| 497 | 1215 static char * |
| 6678 | 1216 ngx_stream_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
|
1217 { |
| 6678 | 1218 ngx_stream_log_main_conf_t *lmcf = 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
|
1219 |
| 6678 | 1220 ngx_str_t *value; |
| 1221 ngx_uint_t i; | |
| 1222 ngx_stream_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
|
1223 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1224 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
|
1225 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1226 fmt = lmcf->formats.elts; |
| 573 | 1227 for (i = 0; i < lmcf->formats.nelts; i++) { |
| 1228 if (fmt[i].name.len == value[1].len | |
| 1229 && 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
|
1230 { |
| 2036 | 1231 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
| 1232 "duplicate \"log_format\" name \"%V\"", | |
| 1233 &value[1]); | |
| 1234 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
|
1235 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1236 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1237 |
| 501 | 1238 fmt = ngx_array_push(&lmcf->formats); |
| 1239 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
|
1240 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
|
1241 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1242 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1243 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
|
1244 |
| 2261 | 1245 fmt->flushes = ngx_array_create(cf->pool, 4, sizeof(ngx_int_t)); |
| 1246 if (fmt->flushes == NULL) { | |
| 1247 return NGX_CONF_ERROR; | |
| 1248 } | |
| 1249 | |
| 6678 | 1250 fmt->ops = ngx_array_create(cf->pool, 16, sizeof(ngx_stream_log_op_t)); |
| 501 | 1251 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
|
1252 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
|
1253 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1254 |
| 6678 | 1255 return ngx_stream_log_compile_format(cf, fmt->flushes, fmt->ops, |
| 1256 cf->args, 2); | |
| 573 | 1257 } |
| 1258 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1259 |
| 573 | 1260 static char * |
| 6678 | 1261 ngx_stream_log_compile_format(ngx_conf_t *cf, ngx_array_t *flushes, |
| 2261 | 1262 ngx_array_t *ops, ngx_array_t *args, ngx_uint_t s) |
| 573 | 1263 { |
| 6678 | 1264 u_char *data, *p, ch; |
| 1265 size_t i, len; | |
| 1266 ngx_str_t *value, var; | |
| 1267 ngx_int_t *flush; | |
|
6840
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1268 ngx_uint_t bracket, json; |
| 6678 | 1269 ngx_stream_log_op_t *op; |
| 573 | 1270 |
|
6840
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1271 json = 0; |
| 573 | 1272 value = args->elts; |
| 1273 | |
|
6840
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1274 if (s < args->nelts && ngx_strncmp(value[s].data, "escape=", 7) == 0) { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1275 data = value[s].data + 7; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1276 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1277 if (ngx_strcmp(data, "json") == 0) { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1278 json = 1; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1279 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1280 } else if (ngx_strcmp(data, "default") != 0) { |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1281 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1282 "unknown log format escaping \"%s\"", data); |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1283 return NGX_CONF_ERROR; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1284 } |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1285 |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1286 s++; |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1287 } |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1288 |
| 573 | 1289 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
|
1290 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1291 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
|
1292 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1293 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
|
1294 |
| 573 | 1295 op = ngx_array_push(ops); |
| 501 | 1296 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
|
1297 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
|
1298 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1299 |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1300 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
|
1301 |
| 880 | 1302 if (value[s].data[i] == '$') { |
| 569 | 1303 |
| 1304 if (++i == value[s].len) { | |
| 1305 goto invalid; | |
| 1306 } | |
| 1307 | |
| 1308 if (value[s].data[i] == '{') { | |
| 1309 bracket = 1; | |
| 1310 | |
| 1311 if (++i == value[s].len) { | |
| 1312 goto invalid; | |
| 1313 } | |
| 1314 | |
| 1315 var.data = &value[s].data[i]; | |
| 1316 | |
| 1317 } else { | |
| 1318 bracket = 0; | |
| 1319 var.data = &value[s].data[i]; | |
| 1320 } | |
| 1321 | |
| 1322 for (var.len = 0; i < value[s].len; i++, var.len++) { | |
| 1323 ch = value[s].data[i]; | |
| 1324 | |
| 1325 if (ch == '}' && bracket) { | |
| 1326 i++; | |
| 1327 bracket = 0; | |
| 1328 break; | |
| 1329 } | |
| 1330 | |
| 1331 if ((ch >= 'A' && ch <= 'Z') | |
| 1332 || (ch >= 'a' && ch <= 'z') | |
| 1333 || (ch >= '0' && ch <= '9') | |
| 1334 || ch == '_') | |
| 1335 { | |
| 1336 continue; | |
| 1337 } | |
| 1338 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1339 break; |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1340 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1341 |
| 569 | 1342 if (bracket) { |
| 1343 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1344 "the closing bracket in \"%V\" " | |
| 1345 "variable is missing", &var); | |
| 1346 return NGX_CONF_ERROR; | |
| 1347 } | |
| 1348 | |
| 1349 if (var.len == 0) { | |
| 1350 goto invalid; | |
| 1351 } | |
| 1352 | |
|
6840
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1353 if (ngx_stream_log_variable_compile(cf, op, &var, json) |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1354 != NGX_OK) |
|
0cf4e82e7c48
Access log: support for json escaping.
Valentin Bartenev <vbart@nginx.com>
parents:
6693
diff
changeset
|
1355 { |
| 569 | 1356 return NGX_CONF_ERROR; |
| 1357 } | |
| 1358 | |
| 2261 | 1359 if (flushes) { |
| 1360 | |
| 1361 flush = ngx_array_push(flushes); | |
| 1362 if (flush == NULL) { | |
| 1363 return NGX_CONF_ERROR; | |
| 1364 } | |
| 1365 | |
| 1366 *flush = op->data; /* variable index */ | |
| 1367 } | |
| 1368 | |
| 573 | 1369 continue; |
| 1370 } | |
| 1371 | |
| 1372 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
|
1373 |
| 880 | 1374 while (i < value[s].len && value[s].data[i] != '$') { |
| 573 | 1375 i++; |
| 1376 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1377 |
| 573 | 1378 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
|
1379 |
| 573 | 1380 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
|
1381 |
| 573 | 1382 op->len = len; |
| 1383 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
|
1384 |
| 573 | 1385 if (len <= sizeof(uintptr_t)) { |
| 6678 | 1386 op->run = ngx_stream_log_copy_short; |
| 573 | 1387 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
|
1388 |
| 573 | 1389 while (len--) { |
| 1390 op->data <<= 8; | |
| 1391 op->data |= data[len]; | |
| 1392 } | |
| 1393 | |
| 1394 } else { | |
| 6678 | 1395 op->run = ngx_stream_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
|
1396 |
| 2049 | 1397 p = ngx_pnalloc(cf->pool, len); |
| 573 | 1398 if (p == NULL) { |
| 1399 return NGX_CONF_ERROR; | |
| 1400 } | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1401 |
| 573 | 1402 ngx_memcpy(p, data, len); |
| 1403 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
|
1404 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1405 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1406 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1407 } |
|
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1408 |
| 569 | 1409 return NGX_CONF_OK; |
| 1410 | |
| 1411 invalid: | |
| 1412 | |
| 1413 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, "invalid parameter \"%s\"", data); | |
| 1414 | |
| 1415 return NGX_CONF_ERROR; | |
| 1416 } | |
| 1417 | |
|
176
c0552e5ab567
nginx-0.0.1-2003-11-09-23:03:38 import; separate building
Igor Sysoev <igor@sysoev.ru>
parents:
119
diff
changeset
|
1418 |
| 2072 | 1419 static char * |
| 6678 | 1420 ngx_stream_log_open_file_cache(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) |
| 2072 | 1421 { |
| 6678 | 1422 ngx_stream_log_srv_conf_t *lscf = conf; |
| 2072 | 1423 |
| 1424 time_t inactive, valid; | |
| 1425 ngx_str_t *value, s; | |
| 1426 ngx_int_t max, min_uses; | |
| 1427 ngx_uint_t i; | |
| 1428 | |
| 6678 | 1429 if (lscf->open_file_cache != NGX_CONF_UNSET_PTR) { |
| 2072 | 1430 return "is duplicate"; |
| 1431 } | |
| 1432 | |
| 1433 value = cf->args->elts; | |
| 1434 | |
| 1435 max = 0; | |
| 1436 inactive = 10; | |
| 1437 valid = 60; | |
| 1438 min_uses = 1; | |
| 1439 | |
| 1440 for (i = 1; i < cf->args->nelts; i++) { | |
| 1441 | |
| 1442 if (ngx_strncmp(value[i].data, "max=", 4) == 0) { | |
| 1443 | |
| 1444 max = ngx_atoi(value[i].data + 4, value[i].len - 4); | |
| 1445 if (max == NGX_ERROR) { | |
| 1446 goto failed; | |
| 1447 } | |
| 1448 | |
| 1449 continue; | |
| 1450 } | |
| 1451 | |
| 1452 if (ngx_strncmp(value[i].data, "inactive=", 9) == 0) { | |
| 1453 | |
| 1454 s.len = value[i].len - 9; | |
| 1455 s.data = value[i].data + 9; | |
| 1456 | |
| 1457 inactive = ngx_parse_time(&s, 1); | |
| 4474 | 1458 if (inactive == (time_t) NGX_ERROR) { |
| 2072 | 1459 goto failed; |
| 1460 } | |
| 1461 | |
| 1462 continue; | |
| 1463 } | |
| 1464 | |
| 1465 if (ngx_strncmp(value[i].data, "min_uses=", 9) == 0) { | |
| 1466 | |
| 1467 min_uses = ngx_atoi(value[i].data + 9, value[i].len - 9); | |
| 1468 if (min_uses == NGX_ERROR) { | |
| 1469 goto failed; | |
| 1470 } | |
| 1471 | |
| 1472 continue; | |
| 1473 } | |
| 1474 | |
| 1475 if (ngx_strncmp(value[i].data, "valid=", 6) == 0) { | |
| 1476 | |
| 1477 s.len = value[i].len - 6; | |
| 1478 s.data = value[i].data + 6; | |
| 1479 | |
| 1480 valid = ngx_parse_time(&s, 1); | |
| 4474 | 1481 if (valid == (time_t) NGX_ERROR) { |
| 2072 | 1482 goto failed; |
| 1483 } | |
| 1484 | |
| 1485 continue; | |
| 1486 } | |
| 1487 | |
| 1488 if (ngx_strcmp(value[i].data, "off") == 0) { | |
| 1489 | |
| 6678 | 1490 lscf->open_file_cache = NULL; |
| 2072 | 1491 |
| 1492 continue; | |
| 1493 } | |
| 1494 | |
| 1495 failed: | |
| 1496 | |
| 1497 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1498 "invalid \"open_log_file_cache\" parameter \"%V\"", | |
| 1499 &value[i]); | |
| 1500 return NGX_CONF_ERROR; | |
| 1501 } | |
| 1502 | |
| 6678 | 1503 if (lscf->open_file_cache == NULL) { |
| 2072 | 1504 return NGX_CONF_OK; |
| 1505 } | |
| 1506 | |
| 1507 if (max == 0) { | |
| 1508 ngx_conf_log_error(NGX_LOG_EMERG, cf, 0, | |
| 1509 "\"open_log_file_cache\" must have \"max\" parameter"); | |
| 1510 return NGX_CONF_ERROR; | |
| 1511 } | |
| 1512 | |
| 6678 | 1513 lscf->open_file_cache = ngx_open_file_cache_init(cf->pool, max, inactive); |
| 2072 | 1514 |
| 6678 | 1515 if (lscf->open_file_cache) { |
| 2072 | 1516 |
| 6678 | 1517 lscf->open_file_cache_valid = valid; |
| 1518 lscf->open_file_cache_min_uses = min_uses; | |
| 2072 | 1519 |
| 1520 return NGX_CONF_OK; | |
| 1521 } | |
| 1522 | |
| 1523 return NGX_CONF_ERROR; | |
| 1524 } | |
| 1525 | |
| 1526 | |
| 569 | 1527 static ngx_int_t |
| 6678 | 1528 ngx_stream_log_init(ngx_conf_t *cf) |
| 569 | 1529 { |
| 6693 | 1530 ngx_stream_handler_pt *h; |
| 6678 | 1531 ngx_stream_core_main_conf_t *cmcf; |
| 573 | 1532 |
| 6678 | 1533 cmcf = ngx_stream_conf_get_module_main_conf(cf, ngx_stream_core_module); |
| 573 | 1534 |
| 6693 | 1535 h = ngx_array_push(&cmcf->phases[NGX_STREAM_LOG_PHASE].handlers); |
| 1536 if (h == NULL) { | |
| 1537 return NGX_ERROR; | |
| 1538 } | |
| 1539 | |
| 1540 *h = ngx_stream_log_handler; | |
| 569 | 1541 |
| 1542 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
|
1543 } |