Skip to content

Commit 4fa49f7

Browse files
agentzhagentzh
committed
merged the master branch into shoki/master.
2 parents 896c006 + 9aca5b2 commit 4fa49f7

File tree

7 files changed

+429
-8
lines changed

7 files changed

+429
-8
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,3 +68,6 @@ all.sh
6868
build9
6969
t/servroot/
7070
buildroot/
71+
build10
72+
go
73+
all

‎README

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,13 +111,24 @@ Caveat
111111
welcome to submit patches for this :)
112112

113113
Directives
114-
srcache_fetch
114+
srcache_fetch <method> <uri> <args>?
115115

116116
srcache_fetch_skip
117117

118-
srcache_store
118+
srcache_store <method> <uri> <args>?
119119

120-
srcache_store_max_size
120+
srcache_store_max_size <size>
121+
Default: srcache_store_max_size 0
122+
123+
When the response body length is exceeding this size, this module
124+
will not try to store the response body into the cache using
125+
the subrequest template that is specified in srcache_store.
126+
127+
This is particular useful when using cache storage backend that
128+
does have a hard upper limit on the input data. For example,
129+
for memcached server, the limit is usually 1 MB.
130+
131+
When 0 is specified (the default value), there's no limit check at all.
121132

122133
srcache_store_skip
123134

‎src/ngx_http_srcache_filter_module.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -235,9 +235,9 @@ ngx_http_srcache_header_filter(ngx_http_request_t *r)
235235
&& r->headers_out.content_length_n > (off_t) slcf->store_max_size)
236236
{
237237
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
238-
"bypass because of too large content-length header: "
239-
"%O (limit is: %z)", r->headers_out.content_length_n,
240-
slcf->store_max_size);
238+
"srcache_store bypassed because of too large Content-Length "
239+
"response header: %O (limit is: %z)",
240+
r->headers_out.content_length_n, slcf->store_max_size);
241241

242242
return ngx_http_next_header_filter(r);
243243
}
@@ -416,8 +416,9 @@ ngx_http_srcache_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
416416
&& ctx->body_length > slcf->store_max_size)
417417
{
418418
ngx_log_debug2(NGX_LOG_DEBUG_HTTP, r->connection->log, 0,
419-
"bypass because body exceeded maximum size: %z "
420-
"(limit is: %z)", ctx->body_length, slcf->store_max_size);
419+
"srcache_store bypassed because response body exceeded "
420+
"maximum size: %z (limit is: %z)",
421+
ctx->body_length, slcf->store_max_size);
421422

422423
ctx->store_response = 0;
423424

‎t/000_init.t

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,19 @@ repeat_each(1);
88
plan tests => repeat_each() * blocks();
99

1010
$ENV{TEST_NGINX_MYSQL_PORT} ||= 3306;
11+
$ENV{TEST_NGINX_POSTGRESQL_PORT} ||= 5432;
1112

1213
our $http_config = <<'_EOC_';
1314
upstream database {
1415
drizzle_server 127.0.0.1:$TEST_NGINX_MYSQL_PORT protocol=mysql
1516
dbname=ngx_test user=ngx_test password=ngx_test;
1617
}
18+
19+
upstream pg {
20+
postgres_server 127.0.0.1:$TEST_NGINX_POSTGRESQL_PORT
21+
dbname=ngx_test user=ngx_test password=ngx_test;
22+
}
23+
1724
_EOC_
1825

1926
worker_connections(128);
@@ -77,3 +84,60 @@ GET /init
7784
GET /init
7885
--- error_code: 200
7986
--- timeout: 10
87+
88+
89+
90+
=== TEST 5: cats - drop table - pg
91+
--- http_config eval: $::http_config
92+
--- config
93+
location = /init {
94+
postgres_pass pg;
95+
postgres_query "DROP TABLE IF EXISTS cats";
96+
}
97+
--- request
98+
GET /init
99+
--- error_code: 200
100+
--- timeout: 10
101+
102+
103+
104+
=== TEST 6: cats - create table - pg
105+
--- http_config eval: $::http_config
106+
--- config
107+
location = /init {
108+
postgres_pass pg;
109+
postgres_query "CREATE TABLE cats (id integer, name text)";
110+
}
111+
--- request
112+
GET /init
113+
--- error_code: 200
114+
--- timeout: 10
115+
116+
117+
118+
=== TEST 7: cats - insert value - pg
119+
--- http_config eval: $::http_config
120+
--- config
121+
location = /init {
122+
postgres_pass pg;
123+
postgres_query "INSERT INTO cats (id) VALUES (2)";
124+
}
125+
--- request
126+
GET /init
127+
--- error_code: 200
128+
--- timeout: 10
129+
130+
131+
132+
=== TEST 8: cats - insert value - pg
133+
--- http_config eval: $::http_config
134+
--- config
135+
location = /init {
136+
postgres_pass pg;
137+
postgres_query "INSERT INTO cats (id, name) VALUES (3, 'bob')";
138+
}
139+
--- request
140+
GET /init
141+
--- error_code: 200
142+
--- timeout: 10
143+

0 commit comments

Comments
 (0)