failbot 2.5.4 → 2.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bae1044f6d88c6617750ffe63b606591880ebe5132d9714d2e4c9534e309962
-  data.tar.gz: b1d80185dae5e664c049ed38583d25086d3659f517826c38912974d93fed32a6
+  metadata.gz: ef2b30021fd84983545c9fa374d030d9c1269d3ef51b778cf84d55fe96fde087
+  data.tar.gz: 998dde878c99c47177d03ff693625e05f1522009d84bf4e5f1a12a0fb398ad0e
 SHA512:
-  metadata.gz: 8114032ca98920f4b902447d1b3c69b28ea6bfe14b52d8b1f431d0537295d5c565d9d8a17540afa72f00f439023bc711291542baa2044ada4cd6f547e9506c35
-  data.tar.gz: f0040811958da514da048dd38af5de2cfd3978d6f036dc78c19b6080991b02bf69cca5b79f684ecc3a8c5b3885b577ecf77116fca445439f7ecfa06fbe5a3452
+  metadata.gz: 774ccebb4f0b04886309e32840d73f17b0278388a73aa6a15541870c791a832f68c767b140ed1d62527feff87ae880aedebf60e942946c103116103c32bda9be
+  data.tar.gz: 778c39eea60f8acdd0b53246401351e1373bf9386259fde67adfb86c0956baa8780fdda6afcf01f942ee6327aa8672390ec57d699e93ade429c8123b6f5ef3a6

data/lib/failbot.rb

@@ -142,6 +142,18 @@ module Failbot
     end
 
     populate_context_from_settings(settings)
+    @enable_timeout = false
+    if settings.key?("FAILBOT_TIMEOUT_MS")
+      @timeout_seconds = settings["FAILBOT_TIMEOUT_MS"].to_f / 1000
+      @enable_timeout = (@timeout_seconds > 0.0)
+    end
+
+    @connect_timeout_seconds = nil
+    if settings.key?("FAILBOT_CONNECT_TIMEOUT_MS")
+      @connect_timeout_seconds = settings["FAILBOT_CONNECT_TIMEOUT_MS"].to_f / 1000
+      # unset the value if it's not parsing to something valid
+      @connect_timeout_seconds = nil unless @connect_timeout_seconds > 0
+    end
 
     self.backend =
       case (name = settings["FAILBOT_BACKEND"])
@@ -152,7 +164,7 @@ module Failbot
       when "file"
         Failbot::FileBackend.new(settings["FAILBOT_BACKEND_FILE_PATH"])
       when "http"
-        Failbot::HTTPBackend.new(URI(settings["FAILBOT_HAYSTACK_URL"]))
+        Failbot::HTTPBackend.new(URI(settings["FAILBOT_HAYSTACK_URL"]), @connect_timeout_seconds)
       when 'json'
         Failbot::JSONBackend.new(settings["FAILBOT_BACKEND_JSON_HOST"], settings["FAILBOT_BACKEND_JSON_PORT"])
       when 'console'
@@ -163,11 +175,6 @@ module Failbot
 
     @raise_errors  = !settings["FAILBOT_RAISE"].to_s.empty?
     @report_errors = settings["FAILBOT_REPORT"] != "0"
-    @enable_timeout = false
-    if settings.key?("FAILBOT_TIMEOUT_MS")
-      @timeout_seconds = settings["FAILBOT_TIMEOUT_MS"].to_f / 1000
-      @enable_timeout = (@timeout_seconds != 0.0)
-    end
 
     # allows overriding the 'app' value to send to single haystack bucket.
     # used primarily on ghe.io.
@@ -508,7 +515,8 @@ module Failbot
   def populate_context_from_settings(settings)
     settings.each do |key, value|
       if /\AFAILBOT_CONTEXT_(.+)\z/ =~ key
-        context[0][$1.downcase] = value
+        key = $1.downcase
+        context[0][key] = value unless context[0][key]
       end
     end
   end

data/lib/failbot/haystack.rb

@@ -4,8 +4,10 @@ require 'json'
 
 module Failbot
   class Haystack
-    def initialize(url)
+    attr_accessor :connect_timeout
+    def initialize(url, connect_timeout=nil)
       @url = url
+      @connect_timeout = connect_timeout
     end
 
     def user
@@ -50,6 +52,9 @@ module Failbot
       # use SSL if applicable
       http.use_ssl = true if @url.scheme == "https"
 
+      # Set the connect timeout if it was provided
+      http.open_timeout = @connect_timeout if @connect_timeout
+
       # push it through
       http.request(request)
     ensure

data/lib/failbot/http_backend.rb

@@ -1,11 +1,12 @@
 module Failbot
   class HTTPBackend
-    def initialize(url)
+    def initialize(url, connect_timeout = nil)
       if url.to_s.empty?
         raise ArgumentError, "FAILBOT_HAYSTACK_URL setting required."
       end
 
-      @haystack = Failbot::Haystack.new(url)
+      @connect_timeout = connect_timeout
+      @haystack = Failbot::Haystack.new(url, connect_timeout)
     end
 
     def report(data)
@@ -19,5 +20,13 @@ module Failbot
     def ping
       @haystack.ping
     end
+
+    def connect_timeout
+      @haystack.connect_timeout
+    end
+
+    def connect_timeout=(timeout)
+      @haystack.connect_timeout = timeout
+    end
   end
 end

data/lib/failbot/version.rb

@@ -1,3 +1,3 @@
 module Failbot
-  VERSION = "2.5.4"
+  VERSION = "2.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: failbot
 version: !ruby/object:Gem::Version
-  version: 2.5.4
+  version: 2.5.5
 platform: ruby
 authors:
 - "@rtomayko"
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-17 00:00:00.000000000 Z
+date: 2020-09-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake