Merge pull request #109 from jsternberg/master

Display error and send failure exit status if redis-cli fails

1 files changed, 5 insertions, 2 deletions

diff --git a/lib/gitlab_update.rb b/lib/gitlab_update.rb
index 038253a..6b3271c 100644
--- a/lib/gitlab_update.rb
+++ b/lib/gitlab_update.rb
@@ -34,7 +34,7 @@ class GitlabUpdate
         update_redis
         exit 0
       else
-        puts "GitLab: You are not allowed to access #{@branch_name}! "
+        puts "GitLab: You are not allowed to access #{@branch_name}!"
         exit 1
       end
     else
@@ -56,6 +56,9 @@ class GitlabUpdate
   def update_redis
     queue = "#{config.redis_namespace}:queue:post_receive"
     msg = JSON.dump({'class' => 'PostReceive', 'args' => [@repo_path, @oldrev, @newrev, @refname, @key_id]})
-    system(*config.redis_command, 'rpush', queue, msg, err: '/dev/null', out: '/dev/null')
+    unless system(*config.redis_command, 'rpush', queue, msg, err: '/dev/null', out: '/dev/null')
+      puts "GitLab: An unexpected error occurred (redis-cli returned #{$?.exitstatus})."
+      exit 1
+    end
   end
 end