Skip to content

Commit c584cd4

Browse files
committed
PROXY_TIMEOUT
1 parent ffb72c8 commit c584cd4

File tree

6 files changed

+27
-5
lines changed

6 files changed

+27
-5
lines changed

openresty-proxy/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,6 @@ COPY ./lua.host.dir.conf /etc/nginx/conf.d/lua.host.dir.conf
88
COPY ./docker-run.sh /docker-run.sh
99

1010
ENV CLIENT_MAX_BODY_SIZE=200M
11+
ENV PROXY_TIMEOUT=60s
1112

1213
CMD /docker-run.sh

openresty-proxy/docker-run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/ash
22

33
sed -i -e "s%--client_max_body_size--%`echo $CLIENT_MAX_BODY_SIZE`%g" /etc/nginx/conf.d/lua.host.dir.conf
4+
sed -i -e "s%--proxy_timeout--%`echo $PROXY_TIMEOUT`%g" /etc/nginx/conf.d/lua.host.dir.conf
45

56

67
exec /usr/local/openresty/bin/openresty -g "daemon off;"

openresty-proxy/https-proxy/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ RUN echo '' >> /usr/local/openresty/nginx/conf/nginx.conf \
1616
&& echo 'env PROXY_PASS_ALL;' >> /usr/local/openresty/nginx/conf/nginx.conf
1717

1818
ENV CLIENT_MAX_BODY_SIZE=200M
19+
ENV PROXY_TIMEOUT=60s
1920
# http才指向PROXY_PASS_DEFAULT
2021
ENV PROXY_PASS_DEFAULT="http://nginx"
2122
# 不管是否http都指向PROXY_PASS_ALL

openresty-proxy/https-proxy/docker-run.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/ash
22

33
sed -i -e "s%--client_max_body_size--%`echo $CLIENT_MAX_BODY_SIZE`%g" /etc/nginx/conf.d/lua.https.proxy.conf
4+
sed -i -e "s%--proxy_timeout--%`echo $PROXY_TIMEOUT`%g" /etc/nginx/conf.d/lua.https.proxy.conf
45

56

67

openresty-proxy/https-proxy/lua.https.proxy.conf

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,10 @@ server {
170170
proxy_set_header X-Real-IP $remote_addr;
171171
proxy_pass $proxy_pass;
172172
proxy_set_header Upgrade $http_upgrade;
173-
proxy_set_header Connection "Upgrade";
173+
proxy_set_header Connection "Upgrade";
174+
proxy_connect_timeout --proxy_timeout--;
175+
proxy_send_timeout --proxy_timeout--;
176+
proxy_read_timeout --proxy_timeout--;
174177

175178
access_by_lua_block {
176179

openresty-proxy/lua.host.dir.conf

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,9 @@ server{
3333
proxy_set_header Upgrade $http_upgrade;
3434
proxy_set_header Connection "Upgrade";
3535
proxy_http_version 1.1;
36+
proxy_connect_timeout --proxy_timeout--;
37+
proxy_send_timeout --proxy_timeout--;
38+
proxy_read_timeout --proxy_timeout--;
3639
}
3740

3841

@@ -54,7 +57,10 @@ server{
5457
proxy_set_header X-Real-IP $remote_addr;
5558
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
5659
proxy_set_header Upgrade $http_upgrade;
57-
proxy_set_header Connection "Upgrade";
60+
proxy_set_header Connection "Upgrade";
61+
proxy_connect_timeout --proxy_timeout--;
62+
proxy_send_timeout --proxy_timeout--;
63+
proxy_read_timeout --proxy_timeout--;
5864
}
5965

6066

@@ -75,7 +81,10 @@ server{
7581
proxy_set_header X-Real-IP $remote_addr;
7682
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
7783
proxy_set_header Upgrade $http_upgrade;
78-
proxy_set_header Connection "Upgrade";
84+
proxy_set_header Connection "Upgrade";
85+
proxy_connect_timeout --proxy_timeout--;
86+
proxy_send_timeout --proxy_timeout--;
87+
proxy_read_timeout --proxy_timeout--;
7988
}
8089

8190

@@ -127,7 +136,10 @@ server{
127136
proxy_set_header X-Real-IP $remote_addr;
128137
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
129138
proxy_set_header Upgrade $http_upgrade;
130-
proxy_set_header Connection "Upgrade";
139+
proxy_set_header Connection "Upgrade";
140+
proxy_connect_timeout --proxy_timeout--;
141+
proxy_send_timeout --proxy_timeout--;
142+
proxy_read_timeout --proxy_timeout--;
131143
}
132144
}
133145

@@ -147,7 +159,10 @@ server{
147159
proxy_set_header X-Real-IP $remote_addr;
148160
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
149161
proxy_set_header Upgrade $http_upgrade;
150-
proxy_set_header Connection "Upgrade";
162+
proxy_set_header Connection "Upgrade";
163+
proxy_connect_timeout --proxy_timeout--;
164+
proxy_send_timeout --proxy_timeout--;
165+
proxy_read_timeout --proxy_timeout--;
151166
}
152167

153168

0 commit comments

Comments
 (0)