Merge pull request gitlabhq#174 from UniIsland/redis-custom-database

support using custom redis database, fixes #173

Author: dzaporozhets

config.yml.example

@@ -31,6 +31,7 @@ redis:
  port: 6379
  # pass: redispass # Allows you to specify the password for Redis
  # socket: /tmp/redis.socket # Only define this if you want to use sockets
+ database: 0
  namespace: resque:gitlab
 
 # Log file.

lib/gitlab_config.rb

@@ -54,13 +54,14 @@ def redis_command
  # for users that haven't updated their configuration
  %W(env -i redis-cli)
  else
+ redis['database'] ||= 0
  if redis.has_key?("socket")
- %W(#{redis['bin']} -s #{redis['socket']})
+ %W(#{redis['bin']} -s #{redis['socket']} -n #{redis['database']})
  else
  if redis.has_key?("pass")
- %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']} -a #{redis['pass']})
+ %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']} -n #{redis['database']} -a #{redis['pass']})
  else
- %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']})
+ %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']} -n #{redis['database']})
  end
  end
  end

spec/gitlab_config_spec.rb

@@ -11,6 +11,7 @@
  it { should have_key('bin') }
  it { should have_key('host') }
  it { should have_key('port') }
+ it { should have_key('database') }
  it { should have_key('namespace') }
  end