Merge pull request #773 from projecthydra-labs/dump_unused_redis_config

Dump unused Redis config value.

lib/curation_concerns/configuration.rb

@@ -91,11 +91,6 @@ def minter_statefile
       @minter_statefile ||= '/tmp/minter-state'
     end
 
-    attr_writer :redis_namespace
-    def redis_namespace
-      @redis_namespace ||= 'curation_concerns'
-    end
-
     attr_writer :display_media_download_link
     def display_media_download_link
       return @display_media_download_link unless @display_media_download_link.nil?

lib/generators/curation_concerns/templates/config/curation_concerns.rb

@@ -46,9 +46,6 @@
   # If you use a multi-server architecture, this MUST be on a shared volume.
   # config.minter_statefile = '/tmp/minter-state'
 
-  # Specify the prefix for Redis keys:
-  # config.redis_namespace = "curation_concerns"
-
   # Specify whether the media display partial should render a download link
   # config.display_media_download_link = true
 

lib/generators/curation_concerns/templates/config/redis_config.rb

@@ -1,26 +1,3 @@
-if defined?(PhusionPassenger)
-  PhusionPassenger.on_event(:starting_worker_process) do |forked|
-    # We're in smart spawning mode.
-    if forked
-      # Re-establish redis connection
-      require 'redis'
-      config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
-
-      # The important two lines
-      Redis.current.disconnect!
-      Redis.current = begin
-                        Redis.new(config.merge(thread_safe: true))
-                      rescue
-                        nil
-                      end
-    end
-  end
-else
-  config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
-  require 'redis'
-  Redis.current = begin
-             Redis.new(config.merge(thread_safe: true))
-           rescue
-             nil
-           end
-end
+require 'redis'
+config = YAML.load(ERB.new(IO.read(File.join(Rails.root, 'config', 'redis.yml'))).result)[Rails.env].with_indifferent_access
+Redis.current = Redis.new(config.merge(thread_safe: true))