Increased unicorn and nginx timeouts

MushroomObserver · Oct 16, 2014 · 1a2fdbd · 1a2fdbd
1 parent b1995f7
commit 1a2fdbd
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/config/etc/nginx.conf b/config/etc/nginx.conf
@@ -85,6 +85,10 @@ http {
   }
 
   server {
+    # set read time out to way too long because of the eol.xml generation
+    # and species list upload features that should both be done in the background
+    proxy_read_timeout 300s;
+
     # enable one of the following if you're on Linux or FreeBSD
     listen 80 default deferred; # for Linux
     # listen 80 default accept_filter=httpready; # for FreeBSD
@@ -98,7 +102,7 @@ http {
     # listen [::]:80 ipv6only=on; # deferred or accept_filter recommended
 
     client_max_body_size 4G;
-    server_name test.mushroomobserver.org;
+    server_name mushroomobserver.org;
 
     # ~2 seconds is often enough for most folks to parse HTML/CSS and
     # retrieve needed images/icons/frames, connections are cheap in

diff --git a/config/unicorn.rb b/config/unicorn.rb
@@ -3,7 +3,7 @@
 working_directory APP_PATH
 listen APP_PATH + '/tmp/.unicorn.sock', :backlog => 64
 listen 8080, :tcp_nopush => true
-timeout 30
+timeout 300
 pid APP_PATH + '/tmp/unicorn.pid'
 stderr_path APP_PATH + '/log/unicorn.stderr.log'
 stdout_path APP_PATH + '/log/unicorn.stdout.log'