watchmonkey_cli 1.12.0 → 1.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d2615fa891c7ccb38541934fa918c33fa37a93cc3d3c52ece8db41a100e1d0b
-  data.tar.gz: 98f2a66da3fdc810c9b7fc1396ba12a605f3cd12d939585e9c9ed03d9f252fbf
+  metadata.gz: 5bb6a637e71a9a3483a2b7b7a7b6dab90469b786c313f742e174743560afaa1b
+  data.tar.gz: 94c468d5e0fe0d8344c321584e78828ecf4b3a43872885b80eb30028eab5e15f
 SHA512:
-  metadata.gz: 23307a955c34627a32e0023df5dc40874eda5d72e80f152e2a57bcf12be767b34db53fc565ffbc8329060cbfe8e72871956123bf553f0ff409ed4468528bca0f
-  data.tar.gz: c671b5bac01cf8c423eef81ada024cd35a1c82f426c9fa80cee4cb90047aa242c579a39248ef349d2cc69d7be281037caac74afa410d59af633029f5b5860b52
+  metadata.gz: dce28700596ca2267765017a3ed23f862cd5cb36951e2d1371ed714cabb9c6d36a0550ad4835ffa1b24ed749a78f775a5c0123ab8d9f9799c1438f988d5f76b8
+  data.tar.gz: dc9afb99c806398ab45cb89dbdb38f6ac30db97b58a63e2012fbe940f33e29009c52af90515ed3267d021532f2edfb997f3957a1af7360b44b26bca4663527cc

data/Gemfile

@@ -3,5 +3,14 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in dle.gemspec
 gemspec
 
+gem "pry"
+gem "bundler"
+gem "rake"
+
+# net-ssh co-deps
+gem "ed25519"
+gem "bcrypt_pbkdf"
+
 # optional dependencies
-gem 'telegram-bot-ruby'
+gem "telegram-bot-ruby"
+gem "net-ftp"

data/VERSION

@@ -1 +1 @@
-1.12.0
+1.13.0

data/checksums/watchmonkey_cli-1.12.1.gem.sha512

@@ -0,0 +1 @@
+55896784ac9e3bc3bfe0998cb907cd13721d773860429de292208dffb19bc34f44d9783cb68814842ceabf982531ee8e650560d882e6b0e90dbd52b59b4d18db

data/doc/checker_example.rb

@@ -20,6 +20,12 @@ module MyWatchmonkeyCheckers
     #self.maxrt = 5.minutes
     #self.maxrt = ->(app, checker, args){ app.opts[:maxrt] && app.opts[:maxrt] * 2 }
 
+    # Maximum amount of time this task may retry on error.
+    # Set to proc to evaluate at runtime
+    # Defaults to app.opts[:max_retry] if nil/unset
+    #self.max_retry = 1
+    #self.max_retry = ->(app, checker, args){ app.opts[:max_retry] && app.opts[:max_retry] * 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/application/core.rb

@@ -3,7 +3,7 @@ module WatchmonkeyCli
     module Core
       def filtered_threads
         Thread.list.reject do |thr|
-          thr.backtrace[0]["gems/concurrent-ruby"] rescue false
+          @opts[:filtered_threads].any?{ thr.backtrace.first&.include?(_1) }
         end
       end
 
@@ -136,7 +136,9 @@ module WatchmonkeyCli
               a << taskopts
 
               checker.debug(result.str_running)
-              checker.rsafe(result) {
+              max_retry = checker.class.max_retry.nil? ? @opts[:max_retry] : checker.class.max_retry
+              max_retry = max_retry.call(self, checker, a) if max_retry.respond_to?(:call)
+              checker.rsafe(result, max_retry: max_retry) {
                 timeout = checker.class.maxrt.nil? ? @opts[:maxrt] : checker.class.maxrt
                 timeout = timeout.call(self, checker, a) if timeout.respond_to?(:call)
                 begin

data/lib/watchmonkey_cli/application.rb

@@ -60,6 +60,7 @@ module WatchmonkeyCli
         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
+        max_retry: 3,            # max retry on error for a single task
         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
@@ -69,6 +70,10 @@ module WatchmonkeyCli
         stdout: STDOUT,          # (internal) STDOUT redirect
         tag_only: [],            # -o flag
         tag_except: [],          # -e flag
+        filtered_threads: [      # (internal) stray-thread-detection exclusion list
+          "gems/concurrent-ruby",
+          "gems/timeout",
+        ],
       }
       init_params
       yield(self)

data/lib/watchmonkey_cli/checker.rb

@@ -25,6 +25,14 @@ module WatchmonkeyCli
       @maxrt = seconds
     end
 
+    def self.max_retry
+      @max_retry
+    end
+
+    def self.max_retry= num
+      @max_retry = num
+    end
+
     module AppHelper
       def init_checkers!
         @checkers = {}
@@ -118,6 +126,14 @@ module WatchmonkeyCli
           sync { @type == meth }
         end
       end
+
+      def fatal! msg = nil
+        sync do
+          @spool[:error] << msg if msg
+          @type = :error
+          throw(:checker, :fatal)
+        end
+      end
     end
 
     # -------------------
@@ -177,13 +193,13 @@ module WatchmonkeyCli
       @app.fetch_connection(:loopback, :local)
     end
 
-    def safe descriptor = nil, &block
+    def safe descriptor = nil, max_retry: 3, &block
       tries = 0
       begin
         tries += 1
         block.call
       rescue StandardError => e
-        unless tries > 3
+        unless tries > max_retry
           app.sync do
             error "#{descriptor}retry #{tries} reason is `#{e.class}: #{e.message}'"
             e.backtrace.each{|l| debug "\t\t#{l}" }
@@ -197,13 +213,21 @@ module WatchmonkeyCli
       end
     end
 
-    def rsafe resultobj, &block
+    def rsafe resultobj, max_retry: 3, &block
       tries = 0
+      checker_ctrl = false
+
       begin
         tries += 1
-        block.call
+        checker_ctrl = catch(:checker, &block)
       rescue StandardError => e
-        unless tries > 3
+        if checker_ctrl == :fatal
+          resultobj.sync do
+            resultobj.error! "fatal reason is `#{e.class}: #{e.message}'"
+            e.backtrace.each{|l| resultobj.debug "\t\t#{l}" }
+            resultobj.dump!
+          end
+        elsif tries <= max_retry
           resultobj.sync do
             resultobj.error! "retry #{tries} reason is `#{e.class}: #{e.message}'"
             e.backtrace.each{|l| resultobj.debug "\t\t#{l}" }
@@ -213,9 +237,10 @@ module WatchmonkeyCli
             sleep 1
             retry
           end
+        else
+          resultobj.error! "retries exceeded"
+          resultobj.dump!
         end
-        resultobj.error! "retries exceeded"
-        resultobj.dump!
       end
     end
 

data/lib/watchmonkey_cli/version.rb

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

data/watchmonkey_cli.gemspec

@@ -21,7 +21,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "httparty"
   spec.add_dependency "net-ssh"
-  spec.add_development_dependency "pry"
-  spec.add_development_dependency "bundler"
-  spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: watchmonkey_cli
 version: !ruby/object:Gem::Version
-  version: 1.12.0
+  version: 1.13.0
 platform: ruby
 authors:
 - Sven Pachnit
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-10-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -52,48 +51,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: If you want an easy way to monitor services without the need of installing
   agents let a monkey do the job by polling status information via transport protocols.
 email:
@@ -112,6 +69,7 @@ files:
 - VERSION
 - bin/watchmonkey
 - bin/watchmonkey.sh
+- checksums/watchmonkey_cli-1.12.1.gem.sha512
 - doc/checker_example.rb
 - doc/config_example.rb
 - lib/watchmonkey_cli.rb
@@ -150,7 +108,6 @@ homepage: https://github.com/2called-chaos/watchmonkey_cli
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -165,8 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Watchmonkey CLI - dead simple agentless monitoring via SSH, HTTP, FTP, etc.
 test_files: []