diff --git a/puppet/modules/colab/manifests/init.pp b/puppet/modules/colab/manifests/init.pp index 547a375..99dc62f 100644 --- a/puppet/modules/colab/manifests/init.pp +++ b/puppet/modules/colab/manifests/init.pp @@ -24,7 +24,7 @@ class colab { } } - ensure_packages(['mercurial', 'memcached']) + ensure_packages(['memcached']) # XMPP connection manager pip::install { 'punjab': } diff --git a/requirements.txt b/requirements.txt index 53fbd48..00d7334 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,8 +20,8 @@ django-i18n-model==0.0.7 django-tastypie==0.11.0 django-browserid==0.9 -gunicorn==18.0 -gevent==0.13.8 +gunicorn==19.1.0 +eventlet==0.15.0 # Deps for sentry client (raven) raven==3.5.2 diff --git a/src/colab/gunicorn.conf.py b/src/colab/gunicorn.conf.py index 0ec2ca5..f2fef36 100644 --- a/src/colab/gunicorn.conf.py +++ b/src/colab/gunicorn.conf.py @@ -1,7 +1,6 @@ import multiprocessing -bind = "127.0.0.1:8000" -workers = multiprocessing.cpu_count() + 1 +workers = multiprocessing.cpu_count() * 2 + 1 timeout = 300 -worker_class = 'gevent' +worker_class = 'eventlet' -- libgit2 0.21.2