diff --git a/Procfile b/Procfile index 0c242887..690c39e1 100644 --- a/Procfile +++ b/Procfile @@ -1,2 +1,2 @@ -web: bin/start-nginx bin/start-pgbouncer-stunnel uwsgi uwsgi.ini +web: bin/start-pgbouncer-stunnel uwsgi uwsgi.ini worker: bin/start-pgbouncer-stunnel celery -A csp worker -B -q diff --git a/static/js/crowdsource.js b/static/js/crowdsource.js index 70b1e8ff..d1d819f8 100644 --- a/static/js/crowdsource.js +++ b/static/js/crowdsource.js @@ -77,7 +77,7 @@ function run($http, $rootScope, $window, $location, Authentication) { return protocol +"://"+ host + ":" + port; }; - + /*$rootScope.$on('oauth:error', function(event, rejection) { if ('invalid_grant' === rejection.data.error) { return; diff --git a/uwsgi.ini b/uwsgi.ini index 6a57a77d..49e31532 100644 --- a/uwsgi.ini +++ b/uwsgi.ini @@ -1,10 +1,10 @@ [uwsgi] -http-socket = /tmp/nginx.socket +http-socket = :$(PORT) emperor = vassals die-on-term = true offload-threads = 1 +single-interpreter = true +enable-threads = true env = DJANGO_SETTINGS_MODULE=csp.settings -module = csp.wsgi:application route = ^/ws uwsgi:/var/tmp/websockets.socket,0,0 route = ^/ uwsgi:/var/tmp/webserver.socket,0,0 -hook-accepting1 = exec:touch /tmp/app-initialized \ No newline at end of file