External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-07 09:27:36 -02:30
Code Issues Packages Projects Releases Wiki Activity

explicitly set long harakiri time to deal with very large inventory deletes

Browse Source
This commit is contained in:
Wayne Witzel III
2016-12-12 00:58:06 -05:00
parent fafec3a0e3
commit c6e1598b9c
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -406,7 +406,7 @@ uwsgi: collectstatic
@if [ "$(VENV_BASE)" ]; then \ @if [ "$(VENV_BASE)" ]; then \
. $(VENV_BASE)/tower/bin/activate; \ . $(VENV_BASE)/tower/bin/activate; \
fi; \ fi; \
uwsgi -b 32768 --socket :8050 --module=awx.wsgi:application --home=/venv/tower --chdir=/tower_devel/ --vacuum --processes=5 --harakiri=60 --master --no-orphans --py-autoreload 1 --max-requests=1000 --stats /tmp/stats.socket --master-fifo=/tmp/awxfifo --lazy-apps uwsgi -b 32768 --socket :8050 --module=awx.wsgi:application --home=/venv/tower --chdir=/tower_devel/ --vacuum --processes=5 --harakiri=120 --master --no-orphans --py-autoreload 1 --max-requests=1000 --stats /tmp/stats.socket --master-fifo=/tmp/awxfifo --lazy-apps
daphne: daphne:
@if [ "$(VENV_BASE)" ]; then \ @if [ "$(VENV_BASE)" ]; then \

9
config/awx-nginx.conf
View File

@@ -23,8 +23,8 @@ http {
} }
sendfile on; sendfile on;
#tcp_nopush on; tcp_nopush on;
#gzip on; tcp_nodelay on;
upstream uwsgi { upstream uwsgi {
server 127.0.0.1:8050; server 127.0.0.1:8050;
@@ -45,7 +45,7 @@ http {
# If you have a domain name, this is where to add it # If you have a domain name, this is where to add it
server_name _; server_name _;
keepalive_timeout 60; keepalive_timeout 65;
ssl_certificate /etc/tower/tower.cert; ssl_certificate /etc/tower/tower.cert;
ssl_certificate_key /etc/tower/tower.key; ssl_certificate_key /etc/tower/tower.key;
@@ -87,8 +87,7 @@ http {
} }
location / { location / {
uwsgi_read_timeout 30s; uwsgi_read_timeout 120s;
uwsgi_send_timeout 30s;
uwsgi_pass uwsgi; uwsgi_pass uwsgi;
include /etc/nginx/uwsgi_params; include /etc/nginx/uwsgi_params;
} }

7
tools/docker-compose/nginx.vh.default.conf
View File

@@ -17,7 +17,7 @@ server {
# If you have a domain name, this is where to add it # If you have a domain name, this is where to add it
server_name _; server_name _;
keepalive_timeout 60; keepalive_timeout 65;
ssl_certificate /etc/nginx/nginx.crt; ssl_certificate /etc/nginx/nginx.crt;
ssl_certificate_key /etc/nginx/nginx.key; ssl_certificate_key /etc/nginx/nginx.key;
@@ -64,9 +64,8 @@ server {
} }
location / { location / {
uwsgi_read_timeout 30s; uwsgi_read_timeout 120s;
uwsgi_send_timeout 30s; uwsgi_pass uwsgi;
uwsgi_pass uwsgi;
include /etc/nginx/uwsgi_params; include /etc/nginx/uwsgi_params;
} }
} }