watchmonkey_cli 1.8.4 → 1.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 185d016ac259cbfe17cdc82fe47bdea64ad3e7287868a1579b0ca5e5ad3af8ca
-  data.tar.gz: ea6d44b3f5333e9f28453cde81879a97ba97bba9007ec2c1541c8671821be84f
+  metadata.gz: 99a845d5e5c412d2d5ba8390da8fa82f8a884fd1983248f5f849481099e09ee6
+  data.tar.gz: 46ff54c844d4be91ddd8552bcc5dfa9e6b2dca89edd3e02617a772a61e328184
 SHA512:
-  metadata.gz: cabbd80f4367b823ad48ae22a3f5cb9c510a67e3b23e42f6c573d08c31b8bec9fbca5262774b82c1e77e039593f38a78e9ba69d6c85be754f8cd066b71b637f4
-  data.tar.gz: '09066c489cf198270f64e6ff08dbfbd12856323dcc89147293c3fce5db6872b0e6f679165ea97b14c2f2a0725f42965cf5f84dc38e8278292091996a069f9404'
+  metadata.gz: fed65583c4e0c6fb3d243bdce9f9ad583f4305005548358cdb5afe648e68358c4310562edca5ab69537111226da449780f4c5a9a862fe726b46a19130409131d
+  data.tar.gz: 8032cc0c6540ce248404b9d5d7368010149549539d9224fc0818dbcffb4f2ca8670caeb0297248e2d3af9027d0e282200765ef14027f40488f80f37875c2651a

data/VERSION

@@ -1 +1 @@
-1.8.4
+1.8.5

data/lib/watchmonkey_cli/application/configuration.tpl

@@ -32,7 +32,12 @@ ssh_connection :my_server, host: "wheel@example.com", port: 23 # additional opti
 # SSL expiration
 # -----
 # Check if a SSL certificate is about to expire.
-# Default threshold is 1.month
+# Available options:
+#
+#    timeout    Maximum time to wait for request (default: 20 seconds)
+#     verify    If enabled the peer will be verified (default: true)
+#  threshold    Minimum certificate lifetime before showing warnings (default: 1.month)
+#
 ssl_expiration "https://example.com", threshold: 3.months
 
 

data/lib/watchmonkey_cli/checkers/ssl_expiration.rb

@@ -4,7 +4,7 @@ module WatchmonkeyCli
       self.checker_name = "ssl_expiration"
 
       def enqueue page, opts = {}
-        opts = { threshold: 1.months, verify: true }.merge(opts)
+        opts = { threshold: 1.months, verify: true, timeout: 20 }.merge(opts)
         app.enqueue(self, page, opts)
       end
 
@@ -13,6 +13,8 @@ module WatchmonkeyCli
         http = Net::HTTP.new(uri.host, uri.port)
         http.use_ssl = true
         http.verify_mode = opts[:verify] ? OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+        http.open_timeout = opts[:timeout]
+        http.read_timeout = opts[:timeout]
         cert = nil
         http.start do |h|
           cert = h.peer_cert

data/lib/watchmonkey_cli/checkers/www_availability.rb

@@ -8,7 +8,8 @@ module WatchmonkeyCli
 
         # if available enable ssl_expiration support
         if page.start_with?("https://") && opts[:ssl_expiration] != false && !app.running?
-          spawn_sub("ssl_expiration", page, opts[:ssl_expiration].is_a?(Hash) ? opts[:ssl_expiration] : {})
+          sopts = { timeout: opts[:timeout] }.merge(opts[:ssl_expiration].is_a?(Hash) ? opts[:ssl_expiration] : {})
+          spawn_sub("ssl_expiration", page, sopts)
         end
       end
 

data/lib/watchmonkey_cli/version.rb

@@ -1,4 +1,4 @@
 module WatchmonkeyCli
-  VERSION = "1.8.4"
+  VERSION = "1.8.5"
   UPDATE_URL = "https://raw.githubusercontent.com/2called-chaos/watchmonkey_cli/master/VERSION"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watchmonkey_cli
 version: !ruby/object:Gem::Version
-  version: 1.8.4
+  version: 1.8.5
 platform: ruby
 authors:
 - Sven Pachnit