From edbcc992d44863c6da5444ee0a5479fbf80d5f2c Mon Sep 17 00:00:00 2001
From: Guo Xiang Tan <tgx_world@hotmail.com>
Date: Tue, 4 Sep 2018 13:19:48 +0800
Subject: [PATCH] Allow unicorn timeout to be configurable via ENV.

---
 config/unicorn.conf.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/unicorn.conf.rb b/config/unicorn.conf.rb
index b4c9dbdd88..9944a17d0e 100644
--- a/config/unicorn.conf.rb
+++ b/config/unicorn.conf.rb
@@ -25,7 +25,7 @@ pid (ENV["UNICORN_PID_PATH"] || "#{discourse_path}/tmp/pids/unicorn.pid")
 if ENV["RAILS_ENV"] == "development" || !ENV["RAILS_ENV"]
   logger Logger.new($stdout)
   # we want a longer timeout in dev cause first request can be really slow
-  timeout 60
+  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,