forgejo-lts: 7.0.10 -> 7.0.11
[NixPkgs.git] / pkgs / servers / web-apps / discourse / unicorn_logging_and_timeout.patch
blob897cad1b66ea1f43a8e49664f5b5ed953f953d7f
1 diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
2 index b8c549bc0f..a7d3592013 100644
3 --- a/config/unicorn.conf.rb
4 +++ b/config/unicorn.conf.rb
5 @@ -35,19 +35,7 @@ FileUtils.mkdir_p("#{discourse_path}/tmp/pids") if !File.exist?("#{discourse_pat
6 # feel free to point this anywhere accessible on the filesystem
7 pid(ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
9 -if ENV["RAILS_ENV"] == "production"
10 - # By default, the Unicorn logger will write to stderr.
11 - # Additionally, some applications/frameworks log to stderr or stdout,
12 - # so prevent them from going to /dev/null when daemonized here:
13 - stderr_path unicorn_stderr_path
14 - stdout_path unicorn_stdout_path
16 - # nuke workers after 30 seconds instead of 60 seconds (the default)
17 - timeout 30
18 -else
19 - # we want a longer timeout in dev cause first request can be really slow
20 - timeout(ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
21 -end
22 +timeout(ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
24 # important for Ruby 2.0
25 preload_app true