Skip to content

Commit 5ea7e46

Browse files
author
Obada Haddad
committed
more logs in circle-ci; remove buffering in nginx
1 parent a287352 commit 5ea7e46

7 files changed

Lines changed: 20 additions & 18 deletions

File tree

.circleci/config.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,8 @@ jobs:
8989
path: tests/test-results
9090
- store_artifacts:
9191
path: dockerLogs/
92+
- store_artifacts:
93+
path: var/log/
9294

9395
workflows:
9496
version: 2

.env_circleci

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,5 @@ SUBMISSIONS_API_URL=http://django:8000/api
4141
# Nginx settings
4242
# -----------------------------------------------------------------------------
4343
HTTPS=False
44-
RATE_LIMIT=100
44+
RATE_LIMIT=10000
4545
DOMAIN_NAME=localhost

docker-compose.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ services:
1111
volumes:
1212
- ./src/staticfiles:/var/www/django/static
1313
- ./maintenance_mode/:/srv
14-
- ./certsNginx:/var/cache/nginx/acme-letsencrypt
14+
- ./nginx/certs/:/var/cache/nginx/acme-letsencrypt
1515
- ./nginx/:/etc/nginx/templates/
1616
- ./var/log/nginx/:/var/log/nginx
1717
restart: unless-stopped
@@ -282,4 +282,4 @@ services:
282282
networks:
283283
frontend:
284284
backend:
285-
#internal: true
285+
internal: true

nginx/extra/base_django.conf.template

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
charset utf-8;
2-
client_max_body_size 10480m;
3-
client_body_buffer_size 32m;
2+
client_max_body_size 0;
3+
proxy_buffering off;
4+
proxy_request_buffering off;
45
sendfile on;
56
gzip on;
67

nginx/http/flower.conf.template

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,4 @@ server {
33
location / {
44
proxy_pass http://flower:5555;
55
}
6-
76
}

nginx/http/minio.conf.template

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,4 @@ server {
1717

1818
proxy_pass http://minio:9000;
1919
}
20-
21-
location /console/ {
22-
rewrite ^/console/(.*)$ /$1 break;
23-
24-
# To support websocket
25-
proxy_http_version 1.1;
26-
proxy_set_header Upgrade $http_upgrade;
27-
proxy_set_header Connection "Upgrade";
28-
29-
chunked_transfer_encoding off;
30-
proxy_pass http://minio;
31-
}
3220
}

nginx/nginx.conf.template

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,18 @@ server {
7575

7676
proxy_pass http://django:8000;
7777
}
78+
# MinIO console
79+
location /console/ {
80+
rewrite ^/console/(.*)$ /$1 break;
81+
82+
# To support websocket
83+
proxy_http_version 1.1;
84+
proxy_set_header Upgrade $http_upgrade;
85+
proxy_set_header Connection "Upgrade";
86+
87+
chunked_transfer_encoding off;
88+
proxy_pass http://minio:9001;
89+
}
7890
include extra/maintenance.conf;
7991

8092
}

0 commit comments

Comments
 (0)