summaryrefslogtreecommitdiff
path: root/lib/gitlab_post_receive.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_post_receive.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_post_receive.rb')
-rw-r--r--lib/gitlab_post_receive.rb10
1 files changed, 6 insertions, 4 deletions
diff --git a/lib/gitlab_post_receive.rb b/lib/gitlab_post_receive.rb
index 0fff479..8632432 100644
--- a/lib/gitlab_post_receive.rb
+++ b/lib/gitlab_post_receive.rb
@@ -2,6 +2,7 @@ require_relative 'gitlab_init'
require_relative 'gitlab_net'
require 'json'
require 'base64'
+require 'redis'
require 'securerandom'
class GitlabPostReceive
@@ -74,11 +75,12 @@ class GitlabPostReceive
queue = "#{config.redis_namespace}:queue:post_receive"
msg = JSON.dump({ 'class' => 'PostReceive', 'args' => [@repo_path, @actor, changes], 'jid' => @jid })
- if system(*config.redis_command, 'rpush', queue, msg,
- err: '/dev/null', out: '/dev/null')
+
+ begin
+ GitlabNet.new.redis_client.rpush(queue, msg)
return true
- else
- puts "GitLab: An unexpected error occurred (redis-cli returned #{$?.exitstatus})."
+ rescue => e
+ puts "GitLab: An unexpected error occurred in writing to Redis: #{e}"
return false
end
end