diff options
| author | Jonne Hass <mrzyx@mrzyx.de> | 2011-09-11 15:54:14 +0400 |
|---|---|---|
| committer | Jonne Hass <mrzyx@mrzyx.de> | 2011-09-11 15:54:14 +0400 |
| commit | a614985d8339679a52e31abd96e198b7a6cb02e4 (patch) | |
| tree | 7bf2144af790b305ed6b7b43135745ec0ece4dd3 /config | |
| parent | 28b6e276f851753a61de9af6d48f997ead5f55fb (diff) | |
made single process mode configuration more consistent
* SINGLE_PROCESS_MODE environment variable takes precedence over
application.yml setting
* SINGLE_PROCESS environment variable takes precedence over
SINGLE_PROCESS_MODE environment variable to be backward compatible
Diffstat (limited to 'config')
| -rw-r--r-- | config/initializers/resque.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/initializers/resque.rb b/config/initializers/resque.rb index af6f820b8..81ffaeb5a 100644 --- a/config/initializers/resque.rb +++ b/config/initializers/resque.rb @@ -6,7 +6,7 @@ if !ENV['SINGLE_PROCESS'] && AppConfig[:redis_url] Resque.redis = Redis.new(:host => AppConfig[:redis_url], :port => 6379) end -if ENV['SINGLE_PROCESS'] || AppConfig.single_process_mode +if AppConfig.single_process_mode? if Rails.env == 'production' puts "WARNING: You are running Diaspora in production without Resque workers turned on. Please don't do this." end |