Skip to content

Commit 40aa8c9

Browse files
authored
remove all the unnecessary stuff! (pypi#4330)
1 parent 8d336d8 commit 40aa8c9

16 files changed

+10
-716
lines changed

Procfile

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
release: bin/release
22
web: bin/start-web python -m gunicorn.app.wsgiapp -c gunicorn.conf warehouse.wsgi:application
3-
worker: bin/start-worker celery -A warehouse worker -B -S redbeat.RedBeatScheduler -l info
3+
web-uploads: bin/start-web python -m gunicorn.app.wsgiapp -c gunicorn-uploads.conf warehouse.wsgi:application
4+
worker: bin/start-worker celery -A warehouse worker -l info --max-tasks-per-child 32
5+
worker-beat: bin/start-worker celery -A warehouse beat -S redbeat.RedBeatScheduler -l info

Procfile.cabotage

-5
This file was deleted.

bin/fastly-config

-173
This file was deleted.

bin/post_compile

-20
This file was deleted.

bin/pre_compile

-11
This file was deleted.

bin/release

-6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,5 @@
33
# Fail fast and fail hard.
44
set -eo pipefail
55

6-
# Setup our Redis settings
7-
source bin/redis-tls
8-
96
# Migrate our database to the latest revision.
107
python -m warehouse db upgrade head
11-
12-
# Make sure that our Fastly configuration is deployed
13-
bin/fastly-config

bin/release-cabotage

-7
This file was deleted.

bin/start-web

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ source bin/redis-tls
99
# Configure Google Cloud
1010
bin/configure-gcloud
1111

12-
# Start nginx and wrap our command
13-
bin/start-nginx "$@"
12+
# Finally, go ahead and execute the given command.
13+
exec "$@"

bin/start-web-cabotage

-13
This file was deleted.

config/nginx.conf.erb

-46
This file was deleted.

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ services:
3636
# working on pypi-theme, this is a private repository due to the fact
3737
# that other people's IP is contained in it.
3838
#THEME_REPO:
39-
command: hupper -m gunicorn.app.wsgiapp -b 0.0.0.0:8000 -c gunicorn-cabotage.conf warehouse.wsgi:application
39+
command: hupper -m gunicorn.app.wsgiapp -b 0.0.0.0:8000 -c gunicorn.conf warehouse.wsgi:application
4040
env_file: dev/environment
4141
volumes:
4242
# We specify all of these directories instead of just . because we want to

gunicorn-cabotage.conf

-17
This file was deleted.
File renamed without changes.

gunicorn.conf

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
1-
bind = 'unix:/tmp/nginx.socket'
1+
bind = 'unix:/var/run/cabotage/cabotage.sock'
22
backlog = 2048
33
preload_app = True
4+
max_requests = 2048
5+
max_requests_jitter = 128
46

57
worker_connections = 1000
6-
timeout = 30
8+
timeout = 60
79
keepalive = 2
810

911
errorlog = '-'

runtime.txt

-1
This file was deleted.

0 commit comments

Comments
 (0)