summaryrefslogtreecommitdiff
path: root/lib/gitlab_net.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_net.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_net.rb')
-rw-r--r--lib/gitlab_net.rb19
1 files changed, 19 insertions, 0 deletions
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index 8b6d33b..8e1fe39 100644
--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
@@ -1,6 +1,7 @@
require 'net/http'
require 'openssl'
require 'json'
+require 'redis'
require_relative 'gitlab_config'
require_relative 'gitlab_logger'
@@ -63,6 +64,24 @@ class GitlabNet
nil
end
+ def redis_client
+ redis_config = config.redis
+ database = redis_config['database'] || 0
+ params = {
+ host: redis_config['host'] || '127.0.0.1',
+ port: redis_config['port'] || 6379,
+ db: database
+ }
+
+ if redis_config.has_key?("socket")
+ params = { path: redis_config['socket'], db: database }
+ elsif redis_config.has_key?("pass")
+ params[:password] = redis_config['pass']
+ end
+
+ Redis.new(params)
+ end
+
protected
def config