From f0d51e24b8908714cd49dd98f10d68e3b54adcee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@jhass.eu>
Date: Thu, 7 May 2015 22:07:22 +0200
Subject: [PATCH] Fix invalid setting calls in config/unicorn.rb
* .present? is an AS extension that isn't loaded at this point
* single_process_mode is defined in environment, not at the toplevel
---
config/unicorn.rb | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/config/unicorn.rb b/config/unicorn.rb
index 719c357c26..28ee4afc7f 100644
--- a/config/unicorn.rb
+++ b/config/unicorn.rb
@@ -18,15 +18,15 @@ timeout AppConfig.server.unicorn_timeout.to_i
#listen '/var/run/diaspora/diaspora.sock', :backlog => 2048
-stderr_path AppConfig.server.stderr_log.get if AppConfig.server.stderr_log.present?
-stdout_path AppConfig.server.stdout_log.get if AppConfig.server.stdout_log.present?
+stderr_path AppConfig.server.stderr_log.get if AppConfig.server.stderr_log?
+stdout_path AppConfig.server.stdout_log.get if AppConfig.server.stdout_log?
before_fork do |server, worker|
# If using preload_app, enable this line
ActiveRecord::Base.connection.disconnect!
# disconnect redis if in use
- unless AppConfig.single_process_mode?
+ unless AppConfig.environment.single_process_mode?
Sidekiq.redis {|redis| redis.client.disconnect }
end
--
GitLab