sys_watchdog 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32e9ee338613c50e7292a0c82b04cf6259d54aa9
-  data.tar.gz: 11f75ee6a5074a2e461dd683997900f03830491d
+  metadata.gz: 0221c538d8757310a166809ebfb18dc070d84c4b
+  data.tar.gz: eeae1dcf833a98af9fa9eba58777af26d96d7f11
 SHA512:
-  metadata.gz: 9bc8050aa88024ddf1a4aa50a3938b9e85decce244ae02a52f38337eb30eddcbef50ce98388732071bf0616c0dc4132282d078b312e86a8d6a755383ec5a9f3e
-  data.tar.gz: c434713b9e4f43bd271f27fa11814394697d0d872f70e475a13efca29fe4e0f819cdbf53219e035a445c78adc59d891498c5299432d18cc3272a1f17d7a2b74c
+  metadata.gz: 3778d095f69a8df419b1453d085e56f63695402a8e6499e508d856b0ce73307bfee2bd77f5bf9ac7229456a687a5b063644bf56cf48b31501749606bc232b617
+  data.tar.gz: 7b3662106dc6a97bdec532404166fd84d0ef6f077d0a3e38e7590d74843f71dc7cf498d7737336c30da20440dafee5476adc03d09bfb29b5e739e3c621a2bcfc

data/README.md

@@ -66,14 +66,14 @@ mail_to      | -
 
 setting           | description
 ------------------|-------------------------------------------------------------------------------------------
-test_cmd          | -
-test_url          | -
-notify_on_change  | -
-restore_cmd       | -
-expected_regex    | -
-expected_string   | -
-expected_max      | -
-expected_min      | -
+test_cmd                 | -
+test_url                 | -
+notify_on_output_change  | -
+restore_cmd              | -
+expected_regex           | -
+expected_string          | -
+expected_max             | -
+expected_min             | -
 
 ## Create a Slack Token
 

data/lib/sys_watchdog/main.rb

@@ -6,8 +6,6 @@ class SysWatchdog
         log_file ||= DEFAULT_LOG_FILE
         conf_file ||= DEFAULT_CONF_FILE
 
-        @trackers = {}
-
         @logger = WdLogger.new log_file
         parse_conf conf_file
 
@@ -52,14 +50,14 @@ class SysWatchdog
     end
 
     def run_test test, after_restore: false
-        success, exitstatus, output = test.run
-
-        notify_change test, output
+        new_status, exitstatus, output = test.run
 
-        return if success == test.fail
+        notify_output_change test, output
 
-        if success
-            test.fail = false
+        return if new_status == test.status
+        test.status = new_status
+        
+        if new_status
             notify "#{test.name} ok"
         else
             if test.restore_cmd and not after_restore
@@ -73,17 +71,14 @@ class SysWatchdog
         @logger.error e.desc
     end
 
-    def notify_change test, output
-        if test.notify_on_change
-            if @trackers[test.name] != output
-                notify "#{test.name} changed", "old: #{@trackers[test.name]}\nnew: #{output}"
-            end
-            @trackers[test.name] = output
+    def notify_output_change test, output
+        if test.notify_on_output_change and test.previous_output != output
+            notify "#{test.name} changed", "old: #{test.previous_output}\nnew: #{output}"
+            test.previous_output = output
         end
     end
 
     def fail test, exitstatus, output
-        test.fail = true
         body = "exitstatus: #{exitstatus}"
         body += "\noutput: #{output}" if output and not output.empty?
         notify "#{test.name} fail", body

data/lib/sys_watchdog/wd_test.rb

@@ -1,8 +1,8 @@
 class WdTest
     attr_accessor :name, 
-                  :test_cmd, :test_url, :notify_on_change, :restore_cmd, 
+                  :test_cmd, :test_url, :notify_output_change, :restore_cmd, 
                   :expected_regex, :expected_string, :expected_max, :expected_min, 
-                  :fail
+                  :status, :previous_output
 
     def initialize name, params, logger
         @logger = logger
@@ -11,7 +11,7 @@ class WdTest
 
         @test_cmd = params[:test_cmd]
         @test_url = params[:test_url]
-        @notify_on_change = params[:notify_on_change]
+        @notify_output_change = params[:notify_output_change]
         @restore_cmd = params[:restore_cmd]
 
         @expected_regex = params[:expected_regex]
@@ -19,7 +19,8 @@ class WdTest
         @expected_max = params[:expected_max]
         @expected_min = params[:expected_min]
 
-        @fail = false
+        @status = true
+        @previous_output = nil
 
         setup
     end
@@ -69,8 +70,8 @@ class WdTest
         if @expected_regex
             @expected_regex = Regexp.new @expected_regex
         end
-        if @notify_on_change
-            @test_cmd = @notify_on_change
+        if @notify_on_output_change
+            @test_cmd = @notify_on_output_change
         end
     end
 

data/sys_watchdog.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = "sys_watchdog"
-  s.version       = "0.0.3"
+  s.version       = "0.0.4"
   s.authors       = ["Tom Lobato"]
   s.email         = "lobato@bettercall.io"
   s.homepage       = "http://sys-watchdog.bettercall.io/"

data/util/sys_watchdog_sample.yml

@@ -17,7 +17,7 @@ config:
 tests:
   ## General
   boot_time:
-    notify_on_change: uptime -s
+    notify_output_change: uptime -s
 
   ## URLs
   site_status:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys_watchdog
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tom Lobato