summaryrefslogtreecommitdiff
path: root/config/unicorn.rb.example
diff options
context:
space:
mode:
authorCaley Woods <caley.w@gmail.com>2012-09-19 10:27:27 -0500
committerCaley Woods <caley.w@gmail.com>2012-09-19 10:27:27 -0500
commite3b149fae611d9c66d3e41048970bd78f322cc9c (patch)
tree588f3bfbabdfdc3dd658ccc9f3c9035f6f2ece8d /config/unicorn.rb.example
parentbf625b7c92d5f07516339f53fdf391185df8547c (diff)
downloadgitlab-ce-e3b149fae611d9c66d3e41048970bd78f322cc9c.tar.gz
Update comment in example unicorn config
The timeout was changed to 30 and the comment wasn't updated. Also I've seen several reports of this timeout not being long enough for quite a few people. It resulted in me getting a 502 bad gateway from nginx until I upped it. Perhaps could back to the default 60 would be better? I changed mine to 300, running on an AWS micro instance.
Diffstat (limited to 'config/unicorn.rb.example')
-rw-r--r--config/unicorn.rb.example2
1 files changed, 1 insertions, 1 deletions
diff --git a/config/unicorn.rb.example b/config/unicorn.rb.example
index 23746d255b4..425dbf33f86 100644
--- a/config/unicorn.rb.example
+++ b/config/unicorn.rb.example
@@ -6,7 +6,7 @@ working_directory app_dir
# worker spawn times
preload_app true
-# nuke workers after 60 seconds (the default)
+# nuke workers after 30 seconds (60 is the default)
timeout 30
# listen on a Unix domain socket and/or a TCP port,