zold 0.14.41 → 0.14.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b4683993fc4c2115b2cf6cf69ea4bc157eb05c2
-  data.tar.gz: 83a3040d404d3b71c2af331bf4085950bfa17fd3
+  metadata.gz: 04ead080c429afa3f286620b291fc6e9de095179
+  data.tar.gz: ee0952e4a5aa6d58ff53a67eecb72f334b14b756
 SHA512:
-  metadata.gz: d28d9c5c4170478c60793e1f7bcab3a50af9cc5fd06b33f78500bd0c8c862010c738a2ca2c00bcf42a20a35512a8955f0e99c8ecb6b55cc6d2016f091ee5997b
-  data.tar.gz: d078e2ec1833d55e2087926e5eac1ac50fc2c199e93f8326a3e8b410f1ba969381d89416d5ca2b09cfd46d2a99ffe527a628e1aa0e1a985aa0702ffb8cba3de1
+  metadata.gz: 7a2ce8dcec67d5b1187012418cf3282c8afd8fac2fa86f25f0278867513331c046b429fa5c1fc691d0b8208c1d3841586e0f59ccbcf32ae8b1ffda13073cada1
+  data.tar.gz: 8193aa27712e777cf67ebcc688d86f7cd22fba0910e8857d42fc531541ad8b28d9b48f69e3f93547501a174616e98aecaec0cad89c99a4d1b055e8e037f4b88b

data/lib/zold/http.rb

@@ -22,6 +22,7 @@
 
 require 'rainbow'
 require 'uri'
+require 'timeout'
 require 'net/http'
 require_relative 'backtrace'
 require_relative 'version'
@@ -54,10 +55,10 @@ module Zold
     PROTOCOL_HEADER = 'X-Zold-Protocol'
 
     # Read timeout in seconds
-    READ_TIMEOUT = 32
+    READ_TIMEOUT = 4
 
     # Connect timeout in seconds
-    CONNECT_TIMEOUT = 8
+    CONNECT_TIMEOUT = 4
 
     # @todo #98:30m/DEV The following two statements are seen as issues by rubocop
     #  raising a Lint/AmbiguousBlockAssociation offense. It is somthing
@@ -76,7 +77,9 @@ module Zold
       http.open_timeout = Http::CONNECT_TIMEOUT
       path = uri.path
       path += '?' + uri.query if uri.query
-      http.request_get(path, headers)
+      Timeout.timeout(Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT) do
+        http.request_get(path, headers)
+      end
     rescue StandardError => e
       Error.new(e)
     end
@@ -88,13 +91,15 @@ module Zold
       http.open_timeout = Http::CONNECT_TIMEOUT
       path = uri.path
       path += '?' + uri.query if uri.query
-      http.request_put(
-        path, body,
-        headers.merge(
-          'Content-Type': 'text/plain',
-          'Content-Length': body.length.to_s
+      Timeout.timeout(Http::READ_TIMEOUT + Http::CONNECT_TIMEOUT) do
+        http.request_put(
+          path, body,
+          headers.merge(
+            'Content-Type': 'text/plain',
+            'Content-Length': body.length.to_s
+          )
         )
-      )
+      end
     rescue StandardError => e
       Error.new(e)
     end

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.14.41'
+  VERSION = '0.14.42'
   PROTOCOL = 2
 end

data/test/test_http.rb

@@ -25,6 +25,7 @@ require 'tmpdir'
 require 'uri'
 require 'webmock/minitest'
 require_relative '../lib/zold/http'
+require_relative '../lib/zold/score'
 
 # Http test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -68,6 +69,15 @@ class TestHttp < Minitest::Test
     assert_equal('200', res.code)
   end
 
+  def test_terminates_on_timeout
+    stub_request(:get, 'http://the-fake-host-99/').to_return do
+      sleep 100
+      { body: 'This should never be returned!' }
+    end
+    res = Zold::Http.new(uri: 'http://the-fake-host-99/', score: nil).get
+    assert_equal('599', res.code)
+  end
+
   def test_sends_valid_version_header
     stub_request(:get, 'http://some-host-3/')
       .with(headers: { 'X-Zold-Version' => Zold::VERSION })

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.41
+  version: 0.14.42
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-04 00:00:00.000000000 Z
+date: 2018-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cachy