From c41db6634ccd66fb8d123969cb21072cb64aae5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 5 May 2013 16:12:22 +0200
Subject: [PATCH] Fix reading of redis namespace from config

Changed default to nil to not screw users running develop already
---
 config/defaults.yml          | 2 +-
 lib/configuration_methods.rb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/config/defaults.yml b/config/defaults.yml
index 4f3b96796..d4b0ecde9 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -13,7 +13,7 @@ defaults:
     require_ssl: true
     single_process_mode: false
     sidekiq:
-      namespace: "diaspora"
+      namespace:
       concurrency: 5
       retry: 10
       backtrace: 15
diff --git a/lib/configuration_methods.rb b/lib/configuration_methods.rb
index 1dc2b2b19..d41ee81e5 100644
--- a/lib/configuration_methods.rb
+++ b/lib/configuration_methods.rb
@@ -93,7 +93,7 @@ module Configuration
         redis_options[:url] = redis_url
       end
       
-      redis_options[:namespace] = AppConfig.environment.sidekiq_namespace.get
+      redis_options[:namespace] = AppConfig.environment.sidekiq.namespace.get
       
       redis_options
     end