summaryrefslogtreecommitdiff
path: root/lib/http_helper.rb
diff options
context:
space:
mode:
authorNick Thomas <nick@gitlab.com>2018-08-14 00:22:46 +0100
committerNick Thomas <nick@gitlab.com>2018-08-14 00:22:46 +0100
commitc8bf2e7d47c3b8f34cb79847edcd5dd50b8f280e (patch)
treecc22dc6c91f58ccaadd97fdd816159de6ec8a135 /lib/http_helper.rb
parent764f6f47fa6a8698ae033532ae49875a87030518 (diff)
downloadgitlab-shell-c8bf2e7d47c3b8f34cb79847edcd5dd50b8f280e.tar.gz
Revert "Merge branch 'ash.mckenzie/srp-refactor' into 'master'"
This reverts commit 3aaf4751e09262c53544a1987f59b1308af9b6c1, reversing changes made to c6577e0d75f51b017f2f332838b97c3ca5b497c0.
Diffstat (limited to 'lib/http_helper.rb')
-rw-r--r--lib/http_helper.rb19
1 files changed, 2 insertions, 17 deletions
diff --git a/lib/http_helper.rb b/lib/http_helper.rb
index 9c7e564..62d0c51 100644
--- a/lib/http_helper.rb
+++ b/lib/http_helper.rb
@@ -1,20 +1,5 @@
-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 NotFoundError < StandardError; end
protected
@@ -91,7 +76,7 @@ module HTTPHelper
$logger.info('finished HTTP request', method: method.to_s.upcase, url: url, duration: Time.new - start_time)
end
- if HTTP_SUCCESS_LIKE.include?(response.code)
+ if response.code == "200"
$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)
@@ -124,7 +109,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