Use an HTTP timeout of 5 minutes by default

2 files changed, 12 insertions, 6 deletions

diff --git a/config.yml.example b/config.yml.example
index a7e8d8a..4dd1018 100644
--- a/config.yml.example
+++ b/config.yml.example
@@ -17,6 +17,7 @@ gitlab_url: "http://localhost:8080"
 
 # See installation.md#using-https for additional HTTPS configuration details.
 http_settings:
+#  read_timeout: 300
 #  user: someone
 #  password: somepass
 #  ca_file: /etc/ssl/cert.pem
diff --git a/lib/gitlab_net.rb b/lib/gitlab_net.rb
index 6f47938..5d0148e 100644
--- a/lib/gitlab_net.rb
+++ b/lib/gitlab_net.rb
@@ -10,6 +10,9 @@ require_relative 'httpunix'
 class GitlabNet
   class ApiUnreachableError < StandardError; end
 
+  CHECK_TIMEOUT = 5
+  READ_TIMEOUT = 300
+
   def check_access(cmd, repo, actor, changes)
     project_name = repo.gsub("'", "")
     project_name = project_name.gsub(/\.git\Z/, "")
@@ -50,7 +53,7 @@ class GitlabNet
   end
 
   def check
-    get("#{host}/check")
+    get("#{host}/check", read_timeout: CHECK_TIMEOUT)
   end
 
   protected
@@ -63,13 +66,15 @@ class GitlabNet
     "#{config.gitlab_url}/api/v3/internal"
   end
 
-  def http_client_for(uri)
+  def http_client_for(uri, options={})
     if uri.is_a?(URI::HTTPUNIX)
       http = Net::HTTPUNIX.new(uri.hostname)
     else
       http = Net::HTTP.new(uri.host, uri.port)
     end
 
+    http.read_timeout = options[:read_timeout] || READ_TIMEOUT
+
     if uri.is_a?(URI::HTTPS)
       http.use_ssl = true
       http.cert_store = cert_store
@@ -92,12 +97,12 @@ class GitlabNet
     request
   end
 
-  def request(method, url, params = {})
+  def request(method, url, params = {}, options={})
     $logger.debug "Performing #{method.to_s.upcase} #{url}"
 
     uri = URI.parse(url)
 
-    http = http_client_for(uri)
+    http = http_client_for(uri, options)
     request = http_request_for(method, uri, params)
 
     begin
@@ -116,8 +121,8 @@ class GitlabNet
     response
   end
 
-  def get(url)
-    request(:get, url)
+  def get(url, options={})
+    request(:get, url, {}, options)
   end
 
   def post(url, params)