Commit c110d110 authored by Dmitriy Zaporozhets's avatar Dmitriy Zaporozhets

Fix and refactor redis command

parent 34d1be9b
...@@ -26,4 +26,23 @@ class GitlabConfig ...@@ -26,4 +26,23 @@ class GitlabConfig
def redis def redis
@config['redis'] ||= {} @config['redis'] ||= {}
end end
def redis_namespace
redis['namespace'] || 'resque:gitlab'
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
"env -i redis-cli"
else
if redis.has_key?("socket")
"#{redis['bin']} -s #{redis['socket']}"
else
"#{redis['bin']} -h #{redis['host']} -p #{redis['port']}"
end
end
end
end end
...@@ -2,8 +2,10 @@ require_relative 'gitlab_init' ...@@ -2,8 +2,10 @@ require_relative 'gitlab_init'
require_relative 'gitlab_net' require_relative 'gitlab_net'
class GitlabUpdate class GitlabUpdate
attr_reader :config
def initialize(repo_path, key_id, refname) def initialize(repo_path, key_id, refname)
config = GitlabConfig.new @config = GitlabConfig.new
@repo_path = repo_path.strip @repo_path = repo_path.strip
@repo_name = repo_path @repo_name = repo_path
...@@ -17,8 +19,6 @@ class GitlabUpdate ...@@ -17,8 +19,6 @@ class GitlabUpdate
@oldrev = ARGV[1] @oldrev = ARGV[1]
@newrev = ARGV[2] @newrev = ARGV[2]
@redis = config.redis
end end
def exec def exec
...@@ -53,16 +53,7 @@ class GitlabUpdate ...@@ -53,16 +53,7 @@ class GitlabUpdate
end end
def update_redis def update_redis
if !@redis.empty? && !@redis.has_key?("socket") command = "#{config.redis_command} rpush '#{config.redis_namespace}:queue:post_receive' '{\"class\":\"PostReceive\",\"args\":[\"#{@repo_path}\",\"#{@oldrev}\",\"#{@newrev}\",\"#{@refname}\",\"#{@key_id}\"]}' > /dev/null 2>&1"
redis_command = "#{@redis['bin']} -h #{@redis['host']} -p #{@redis['port']}"
elsif !@redis.empty? && @redis.has_key?("socket")
redis_command = "#{@redis['bin']} -s #{@redis['socket']}"
else
# Default to old method of connecting to redis for users that haven't updated their configuration
redis_command = "env -i redis-cli"
end
command = "#{redis_command} rpush '#{@redis['namespace']}:queue:post_receive' '{\"class\":\"PostReceive\",\"args\":[\"#{@repo_path}\",\"#{@oldrev}\",\"#{@newrev}\",\"#{@refname}\",\"#{@key_id}\"]}' > /dev/null 2>&1"
system(command) system(command)
end end
end end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment