diff options
author | Ash McKenzie <amckenzie@gitlab.com> | 2018-07-26 18:20:51 +1000 |
---|---|---|
committer | Ash McKenzie <amckenzie@gitlab.com> | 2018-08-01 00:24:16 +1000 |
commit | f2eb95f00cc36108f66afbff1481a9354eca35e1 (patch) | |
tree | cccfe34356543071768f2cb5cd61badf527794e1 | |
parent | 25e751e9eec5b5c685e1623fe3527235b75cd051 (diff) | |
download | gitlab-shell-f2eb95f00cc36108f66afbff1481a9354eca35e1.tar.gz |
HTTPHelper fix requires, add/use status constants
-rw-r--r-- | lib/http_helper.rb | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/lib/http_helper.rb b/lib/http_helper.rb index 9d55b07..d7fa10a 100644 --- a/lib/http_helper.rb +++ b/lib/http_helper.rb @@ -1,5 +1,18 @@ +require 'net/http' +require 'openssl' + +require_relative 'gitlab_config' +require_relative 'httpunix' + module HTTPHelper READ_TIMEOUT = 300 + HTTP_SUCCESS = '200'.freeze + HTTP_MULTIPLE_CHOICES = '300'.freeze + HTTP_UNAUTHORIZED = '401'.freeze + HTTP_NOT_FOUND = '404'.freeze + + HTTP_SUCCESS_LIKE = [HTTP_SUCCESS, HTTP_MULTIPLE_CHOICES].freeze + class ApiUnreachableError < StandardError; end class NotFound < StandardError; end @@ -78,7 +91,7 @@ module HTTPHelper $logger.info('finished HTTP request', method: method.to_s.upcase, url: url, duration: Time.new - start_time) end - if response.code == "200" + if HTTP_SUCCESS_LIKE.include?(response.code) $logger.debug('Received response', code: response.code, body: response.body) else $logger.error('Call failed', method: method.to_s.upcase, url: url, code: response.code, body: response.body) @@ -111,7 +124,7 @@ module HTTPHelper end def secret_token - @secret_token ||= File.read config.secret_file + @secret_token ||= File.read(config.secret_file) end def read_timeout |