From 5f986464daa6b66550770c788cebc276749f1912 Mon Sep 17 00:00:00 2001
From: Dennis Schubert <mail@dennis-schubert.de>
Date: Sun, 24 Jan 2016 07:29:28 +0100
Subject: [PATCH] Drop Redis namespace support

---
 Changelog.md                 | 8 ++++++++
 config/defaults.yml          | 1 -
 config/diaspora.yml.example  | 4 ----
 lib/configuration_methods.rb | 2 --
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Changelog.md b/Changelog.md
index 2b4a71dfb..2827c8019 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -26,6 +26,14 @@ changed. diaspora\* will no longer listen on `0.0.0.0:3000` as it will now
 bind to an UNIX socket at `unix:tmp/diaspora.sock`. Please change your local
 `diaspora.yml` if necessary.
 
+## Redis namespace support dropped
+
+We dropped support for Redis namespaces in this release. If you previously set
+a custom namespace, please note that diaspora\* will no longer use the
+configured value. By default, Redis supports up to 8 databases which can be
+selected via the Redis URL in `diaspora.yml`. Please check the examples
+provided in our configuration example file.
+
 ## Terms of Use design changes
 
 With the port to Bootstrap 3, app/views/terms/default.haml has a new structure. If you have created a customised app/views/terms/terms.haml or app/views/terms/terms.erb file, you will need to edit those files to base your customisations on the new default.haml file.
diff --git a/config/defaults.yml b/config/defaults.yml
index 7a3cfa647..f5ba510d5 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -13,7 +13,6 @@ defaults:
     require_ssl: true
     single_process_mode: false
     sidekiq:
-      namespace:
       concurrency: 5
       retry: 10
       backtrace: 15
diff --git a/config/diaspora.yml.example b/config/diaspora.yml.example
index c38cebec0..109e89ee1 100644
--- a/config/diaspora.yml.example
+++ b/config/diaspora.yml.example
@@ -85,10 +85,6 @@ configuration: ## Section
       ## Set it to false to disable it completely.
       #retry: 10
 
-      ## Namespace to use in Redis. Useful if you need to run
-      ## multiple instances of Diaspora using the same Redis instance.
-      #namespace: "diaspora"
-
       ## Lines of backtrace that are stored on failure (default=15).
       ## Set n to the required value. Set this to false to reduce memory
       ## usage (and log size) if you're not interested in this data.
diff --git a/lib/configuration_methods.rb b/lib/configuration_methods.rb
index 81d769b78..c751a7a97 100644
--- a/lib/configuration_methods.rb
+++ b/lib/configuration_methods.rb
@@ -120,8 +120,6 @@ module Configuration
         redis_options[:url] = redis_url
       end
 
-      redis_options[:namespace] = AppConfig.environment.sidekiq.namespace.get
-
       redis_options
     end