diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-12 19:10:13 +0300 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-09-12 19:10:13 +0300 |
| commit | 00e30138af0ebec24255d08c5166cfd1faa28f6d (patch) | |
| tree | 6060deff857e906d815340a4dcd5f214f5bea1cf /lib/gitlab_config.rb | |
| parent | 24dda4a8b4355859a2451d9e67e3eaff6ff6e443 (diff) | |
| parent | 4228aacaa77fdfb7a2be5c6198fb1e9a21d386e7 (diff) | |
| download | gitlab-shell-00e30138af0ebec24255d08c5166cfd1faa28f6d.tar.gz | |
Merge pull request #174 from UniIsland/redis-custom-database
support using custom redis database, fixes #173
Diffstat (limited to 'lib/gitlab_config.rb')
| -rw-r--r-- | lib/gitlab_config.rb | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb index 1ebb08e..ccd17ed 100644 --- a/lib/gitlab_config.rb +++ b/lib/gitlab_config.rb @@ -54,13 +54,14 @@ class GitlabConfig # 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 |
