summaryrefslogtreecommitdiff
path: root/lib/gitlab_config.rb
diff options
context:
space:
mode:
authorStan Hu <stanhu@gmail.com>2016-05-09 00:21:10 -0700
committerStan Hu <stanhu@gmail.com>2016-05-12 07:00:19 -0500
commit7f7359b1381d376b81fd9b81120d8cfa0231a526 (patch)
treebec8110ed8c14fb0dc38ced1ebf21177dbc2acc5 /lib/gitlab_config.rb
parentf0f1bbec8ad5d5fade7c0efeee22ba9b9bc44f07 (diff)
downloadgitlab-shell-7f7359b1381d376b81fd9b81120d8cfa0231a526.tar.gz
Use Redis Ruby client instead of shelling out to redis-cli
Closes gitlab-org/gitlab-ce#17329
Diffstat (limited to 'lib/gitlab_config.rb')
-rw-r--r--lib/gitlab_config.rb22
1 files changed, 0 insertions, 22 deletions
diff --git a/lib/gitlab_config.rb b/lib/gitlab_config.rb
index 831f0e3..ebf72d6 100644
--- a/lib/gitlab_config.rb
+++ b/lib/gitlab_config.rb
@@ -54,26 +54,4 @@ class GitlabConfig
def git_annex_enabled?
@config['git_annex_enabled'] ||= false
end
-
- # Build redis command to write update event in gitlab queue
- def redis_command
- if redis.empty?
- # Default to old method of connecting to redis
- # for users that haven't updated their configuration
- %W(env -i redis-cli)
- else
- redis['database'] ||= 0
- redis['host'] ||= '127.0.0.1'
- redis['port'] ||= '6379'
- if redis.has_key?("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']} -n #{redis['database']} -a #{redis['pass']})
- else
- %W(#{redis['bin']} -h #{redis['host']} -p #{redis['port']} -n #{redis['database']})
- end
- end
- end
- end
end