github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-12-01 20:15:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

adjust timeouts in dev

Browse Source
This commit is contained in:
Sam 2018-08-15 11:13:43 +10:00
parent b8667c77c4
commit 1172e141cd
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
config/unicorn.conf.rb
View File

@ -15,9 +15,6 @@ working_directory discourse_path
# listen "#{discourse_path}/tmp/sockets/unicorn.sock" # listen "#{discourse_path}/tmp/sockets/unicorn.sock"
listen (ENV["UNICORN_PORT"] || 3000).to_i listen (ENV["UNICORN_PORT"] || 3000).to_i
# nuke workers after 30 seconds instead of 60 seconds (the default)
timeout 30
if !File.exist?("#{discourse_path}/tmp/pids") if !File.exist?("#{discourse_path}/tmp/pids")
FileUtils.mkdir_p("#{discourse_path}/tmp/pids") FileUtils.mkdir_p("#{discourse_path}/tmp/pids")
end end
@ -27,12 +24,16 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
if ENV["RAILS_ENV"] == "development" || !ENV["RAILS_ENV"] if ENV["RAILS_ENV"] == "development" || !ENV["RAILS_ENV"]
logger Logger.new($stdout) logger Logger.new($stdout)
# we want a longer timeout in dev cause first request can be really slow
timeout 60
else else
# By default, the Unicorn logger will write to stderr. # By default, the Unicorn logger will write to stderr.
# Additionally, some applications/frameworks log to stderr or stdout, # Additionally, some applications/frameworks log to stderr or stdout,
# so prevent them from going to /dev/null when daemonized here: # so prevent them from going to /dev/null when daemonized here:
stderr_path "#{discourse_path}/log/unicorn.stderr.log" stderr_path "#{discourse_path}/log/unicorn.stderr.log"
stdout_path "#{discourse_path}/log/unicorn.stdout.log" stdout_path "#{discourse_path}/log/unicorn.stdout.log"
# nuke workers after 30 seconds instead of 60 seconds (the default)
timeout 30
end end
# important for Ruby 2.0 # important for Ruby 2.0