watchmonkey_cli 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b298374ee831d146ff709f5ec48c032eb5b3806705e08b899224c0efbe0f6bd
-  data.tar.gz: 0f58a4b638370a9f248f9afbab36c2f4e30296ac222d8e8d46ab08e6277f78cd
+  metadata.gz: 2130727c6200a2fffef5220a52052df322b126e610dfdf18431f4c05841bd286
+  data.tar.gz: e8130e7bd3267c92a3352d102a577d7bd047c35905eae7291e9ddfe49da822e9
 SHA512:
-  metadata.gz: d7b084fe27627f5e0890567ea45dfa05b9b39e40edddfc411ee1fd4246ef7a3c1b2716d323bca4241748a40ba43f620ee098b1699babc71dc60241a2dee7d9d0
-  data.tar.gz: fadca599fafa8c1adb5aaef7e9b91a6f89d9b191f8a8c89a9385366c0c4d9924e0061408ae032c5490c32db68ce5a7c06b7ea006659b3a72e486062e7cdc20e6
+  metadata.gz: '053523431494e83e9c6e72f4b1d1313cf3be03fe3f5a566deabcc2e2d22ec0db17d7d04f82a0fddbc91cd88024267d36d7a8bd1ffe7b5bc6c1990b6cfd1d41ba'
+  data.tar.gz: d4072ceafae6848acef9e34591cf1e33ddbf6df248eafa8f6018f0c1b7feb1c66e2238b388724a15cd5fa82669b9a6cd21b1f56f0518adc4c0ce040c730074b3

data/VERSION

@@ -1 +1 @@
-1.9.1
+1.10.0

data/doc/checker_example.rb

@@ -12,6 +12,14 @@ module MyWatchmonkeyCheckers
     #     e.g. my_checker "http://google.com", some_option: true
     self.checker_name = "my_checker"
 
+    # Maximum amount of time this task may run before it gets killed.
+    # Set to 0/false to have no time limit whatsoever.
+    # Set to proc to evaluate at runtime
+    # Defaults to app.opts[:maxrt] if nil/unset
+    #self.maxrt = false
+    #self.maxrt = 5.minutes
+    #self.maxrt = ->(app, checker, args){ app.opts[:maxrt] && app.opts[:maxrt] * 2 }
+
     # Called by configuration defining a check with all the arguments.
     #   e.g. my_checker "http://google.com", some_option: true
     # Should invoke `app.enqueue` which will by default call `#check!` method with given arguments.

data/lib/watchmonkey_cli.rb

@@ -33,6 +33,7 @@ require "watchmonkey_cli/application/dispatch"
 require "watchmonkey_cli/application"
 
 # require buildin checkers
+require "watchmonkey_cli/checkers/dev_pry"
 require "watchmonkey_cli/checkers/ftp_availability"
 require "watchmonkey_cli/checkers/mysql_replication"
 require "watchmonkey_cli/checkers/ssl_expiration"

data/lib/watchmonkey_cli/application.rb

@@ -45,6 +45,8 @@ module WatchmonkeyCli
         colorize: true,          # -m flag
         debug: false,            # -d flag
         threads: 10,             # -t flag
+        maxrt: 120.seconds,      # max runtime of a single task after which it will be terminated (may break SSH connection), 0/false to not limit runtime
+        conclosewait: 10,        # max seconds to wait for connections to be closed (may never if they got killed by maxrt)
         loop_forever: false,     # (internal) loop forever (app mode)
         loop_wait_empty: 1,      # (internal) time to wait in thread if queue is empty
         silent: false,           # -s flag

data/lib/watchmonkey_cli/application/core.rb

@@ -81,7 +81,10 @@ module WatchmonkeyCli
 
       def close_connections!
         @connections.each do |type, clist|
-          clist.each{|id, con| con.close! }
+          clist.each do |id, con|
+            debug "[SHUTDOWN] closing #{type} connection #{id} #{con}"
+            con.close!
+          end
         end
       end
 
@@ -98,7 +101,19 @@ module WatchmonkeyCli
             begin
               result = Checker::Result.new(checker, *a)
               checker.debug(result.str_running)
-              checker.safe(result.str_safe) { cb.call(result, *a) }
+              checker.safe(result.str_safe) {
+                timeout = checker.class.maxrt.nil? ? @opts[:maxrt] : checker.class.maxrt
+                timeout = timeout.call(self, checker, a) if timeout.respond_to?(:call)
+                begin
+                  if timeout && timeout > 0
+                    Timeout::timeout(timeout) { cb.call(result, *a) }
+                  else
+                    cb.call(result, *a)
+                  end
+                rescue Timeout::Error => ex
+                  result.error! "TIMEOUT: did not finish within #{timeout} seconds, task killed!"
+                end
+              }
               fire(:result_dump, result, a, checker)
               result.dump!
             ensure

data/lib/watchmonkey_cli/application/dispatch.rb

@@ -41,7 +41,7 @@ module WatchmonkeyCli
       ensure
         @running = false
         stop_checkers!
-        close_connections!
+        Timeout::timeout(@opts[:conclosewait]) { close_connections! } rescue false
         release_signals
       end
 

data/lib/watchmonkey_cli/checker.rb

@@ -17,6 +17,14 @@ module WatchmonkeyCli
       @checker_name = name
     end
 
+    def self.maxrt
+      @maxrt
+    end
+
+    def self.maxrt= seconds
+      @maxrt = seconds
+    end
+
     module AppHelper
       def init_checkers!
         @checkers = {}
@@ -168,8 +176,10 @@ module WatchmonkeyCli
             error "#{descriptor}retry #{tries} reason is `#{e.class}: #{e.message}'"
             e.backtrace.each{|l| debug "\t\t#{l}" }
           end
-          sleep 1
-          retry
+          unless $wm_runtime_exiting
+            sleep 1
+            retry
+          end
         end
         error "#{descriptor}retries exceeded"
       end

data/lib/watchmonkey_cli/checkers/dev_pry.rb

@@ -0,0 +1,29 @@
+module WatchmonkeyCli
+  module Checkers
+    class DevPry < Checker
+      self.checker_name = "dev_pry"
+      self.maxrt = false
+
+      def enqueue host, opts = {}
+      	host = app.fetch_connection(:loopback, :local) if !host || host == :local
+        host = app.fetch_connection(:ssh, host) if host.is_a?(Symbol)
+        app.enqueue(self, host, opts)
+      end
+
+      def check! result, host, opts = {}
+        if app.opts[:threads] > 1
+          result.error! "pry only works properly within the main thread, run watchmonkey with `-t0`"
+          return
+        end
+
+        begin
+          require "pry"
+          binding.pry
+          1+1 # pry may bug out otherwise if it's last statement
+        rescue LoadError => ex
+          result.error! "pry is required (gem install pry)! #{ex.class}: #{ex.message}"
+        end
+      end
+    end
+  end
+end

data/lib/watchmonkey_cli/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: watchmonkey_cli
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Sven Pachnit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-16 00:00:00.000000000 Z
+date: 2020-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -123,6 +123,7 @@ files:
 - lib/watchmonkey_cli/application/dispatch.rb
 - lib/watchmonkey_cli/application/output_helper.rb
 - lib/watchmonkey_cli/checker.rb
+- lib/watchmonkey_cli/checkers/dev_pry.rb
 - lib/watchmonkey_cli/checkers/ftp_availability.rb
 - lib/watchmonkey_cli/checkers/mysql_replication.rb
 - lib/watchmonkey_cli/checkers/ssl_expiration.rb