Merge pull request #2160 from zz9pzza/AO3-4329

AO3-4329 Split a string to find the memcached servers
otwcode · Sep 15, 2015 · e1f2c2f · e1f2c2f
2 parents 5be4bda + b317047
commit e1f2c2f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 16 deletions.
diff --git a/config/environments/production.rb b/config/environments/production.rb
@@ -28,14 +28,7 @@
   # config.logger = SyslogLogger.new
 
   # Use a different cache store in production
-  config.cache_store = :dalli_store, YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL0'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL1'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL2'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL3'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL4'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL5'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL6'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL7'],
+  config.cache_store = :dalli_store, YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_SERVERS'],
                           { :namespace =>  'ao3-v1', :expires_in =>  0, :compress => true , :pool_size => 10 }
 
   # Disable Rails's static asset server

diff --git a/config/environments/staging.rb b/config/environments/staging.rb
@@ -28,14 +28,7 @@
   # config.logger = SyslogLogger.new
 
   # Use a different cache store in production
-  config.cache_store = :dalli_store, YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL0'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL1'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL2'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL3'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL4'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL5'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL6'],
-                                     YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_URL7'],
+  config.cache_store = :dalli_store, YAML.load_file("#{Rails.root}/config/local.yml")['MEMCACHED_SERVERS'],
                           {  :namespace =>  'ao3-v1', :expires_in => 0,  :compress => true , :pool_size => 5 }
 
   # Disable Rails's static asset server