summaryrefslogtreecommitdiff
path: root/bin
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-01-12 13:37:20 +0000
committerNick Thomas <nick@gitlab.com>2018-01-12 13:58:15 +0000
commitd1c01fe80b3dc94a82a62b563dbda3ebd751a033 (patch)
treec9e1d0b73578704ed1beb619bd277794f05a0087 /bin
parent73e2cf531ca8b92dc48da5024c8095256aa10818 (diff)
downloadgitlab-shell-d1c01fe80b3dc94a82a62b563dbda3ebd751a033.tar.gz
Remove direct redis integration
Diffstat (limited to 'bin')
-rwxr-xr-xbin/check23
1 files changed, 4 insertions, 19 deletions
diff --git a/bin/check b/bin/check
index 2eec54e..d2224a6 100755
--- a/bin/check
+++ b/bin/check
@@ -3,17 +3,6 @@
require_relative '../lib/gitlab_init'
require_relative '../lib/gitlab_net'
-def ping_redis
- print "Send ping to redis server: "
- if GitlabNet.new.redis_client.ping
- print 'OK'
- else
- abort 'FAILED'
- end
-
- puts "\n"
-end
-
#
# GitLab shell check task
#
@@ -30,15 +19,11 @@ begin
check_values = JSON.parse(resp.body)
- if check_values.key?('redis')
- print 'Redis available via internal API: '
- if check_values['redis']
- puts 'OK'
- else
- abort 'FAILED'
- end
+ print 'Redis available via internal API: '
+ if check_values['redis']
+ puts 'OK'
else
- ping_redis
+ abort 'FAILED'
end
rescue GitlabNet::ApiUnreachableError
abort "FAILED: Failed to connect to internal API"