nixpkgs/pkgs/servers/web-apps/discourse/unicorn_logging_and_timeout.patch

26 lines
998 B
Diff
Raw Normal View History

2021-03-12 11:58:31 +00:00
diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
2021-05-25 21:16:44 +00:00
index ffcafcb618..31ba691983 100644
2021-03-12 11:58:31 +00:00
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -27,18 +27,10 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
2021-05-25 21:16:44 +00:00
if ENV["RAILS_ENV"] != "production"
2021-03-12 11:58:31 +00:00
logger Logger.new($stdout)
- # we want a longer timeout in dev cause first request can be really slow
- timeout (ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
-else
- # By default, the Unicorn logger will write to stderr.
- # Additionally, some applications/frameworks log to stderr or stdout,
- # so prevent them from going to /dev/null when daemonized here:
- stderr_path "#{discourse_path}/log/unicorn.stderr.log"
- stdout_path "#{discourse_path}/log/unicorn.stdout.log"
- # nuke workers after 30 seconds instead of 60 seconds (the default)
- timeout 30
end
+timeout (ENV["UNICORN_TIMEOUT"] && ENV["UNICORN_TIMEOUT"].to_i || 60)
+
# important for Ruby 2.0
preload_app true