sys_watchdog 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a8c520ccb449f03c4e01c9dbfc6c5aa0e97b9be
-  data.tar.gz: cbb848cf690845b14b1a8d2e510d25ec8f88e047
+  metadata.gz: 32e9ee338613c50e7292a0c82b04cf6259d54aa9
+  data.tar.gz: 11f75ee6a5074a2e461dd683997900f03830491d
 SHA512:
-  metadata.gz: e2ddc3711f3f821c1a39e6a873144bf4ddf8a4b8a9acee7ec6f9338a5b2438eecb76bd018bd118aa9042056c166cbca68089e8a4240bf0aa73e443b3cadbebb1
-  data.tar.gz: 12d037642d2917c77786a6ec97c2b341128e55ac353561870982f9208ac97ff366d2be9d10f143ec50a7797480eadcd96fec31e1420d37c927a1a00bd2243f83
+  metadata.gz: 9bc8050aa88024ddf1a4aa50a3938b9e85decce244ae02a52f38337eb30eddcbef50ce98388732071bf0616c0dc4132282d078b312e86a8d6a755383ec5a9f3e
+  data.tar.gz: c434713b9e4f43bd271f27fa11814394697d0d872f70e475a13efca29fe4e0f819cdbf53219e035a445c78adc59d891498c5299432d18cc3272a1f17d7a2b74c

data/CNAME

@@ -0,0 +1 @@
+sys-watchdog.bettercall.io

data/README.md

@@ -4,7 +4,7 @@ Sys Watchdog
 
 ** perform all steps as root
 
-## Installation
+## Install
 
 ```
 gem install sys_watchdog
@@ -14,7 +14,7 @@ If using Rbenv, run ```rbenv rehash``` to make sys_watchdog binary available.
 
 ## Setup
 
-If on Linux with systemd available (eg: Ubuntu 16+, RedHat 7+. Generally distro versions released from 2015):  
+If on Linux with systemd available (eg: Ubuntu 16+, RedHat 7+. Generally distro versions released from 2015 on):  
 
 ```
 sys_watchdog setup_with_systemd
@@ -26,29 +26,30 @@ Otherwise:
 sys_watchdog setup_with_cron
 ```
 
-### Configuration
+Edit ```/etc/sys_watchdog.yml```. You can see example configurations in [util/sys_watchdog_sample.yml](https://github.com/tomlobato/sys_watchdog/blob/master/util/sys_watchdog_sample.yml) and [test/sys_watchdog_test.yml](https://github.com/tomlobato/sys_watchdog/blob/master/test/sys_watchdog_test.yml).  
 
-After install, edit ```/etc/sys_watchdog.yml```.
-You can see some examples in this file and in [/test/sys_watchdog_test.yml](https://github.com/tomlobato/sys_watchdog/blob/master/test/sys_watchdog_test.yml).  
+## Test run
 
-Now you can test from the command line. 
+Run from command line:  
 
 ```
 sys_watchdog test
 ``` 
 
-### Start
+It will execute all system tests defined in ```/etc/sys_watchdog.yml``` and exit. You can use this to adjust your tests and get a grasp of the sys_watchdog operation.  
 
-Finally, after installed and configured, enable periodic run...
+## Start
+
+Finally, start the periodic run...
 
 for systemd:  
 ```systemctl start sys_watchdog```
 
-or uncommenting the added cron line:  
+or, if installed with cron, uncomment the cron job line:  
 ```vim /etc/crontab```
 
 
-### Config Settings
+## Config Settings
 
 setting      | description
 -------------|-------------------------------------------------------------------------------------------------
@@ -61,7 +62,7 @@ smtp_domain  | -
 mail_from    | -
 mail_to      | -
 
-#### Sys Test Settings
+## Sys Test Settings
 
 setting           | description
 ------------------|-------------------------------------------------------------------------------------------

data/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

data/lib/sys_watchdog/main.rb

@@ -3,9 +3,14 @@ class SysWatchdog
     DEFAULT_LOG_FILE  = '/var/log/sys_watchdog.log'
 
     def initialize conf_file: nil, log_file: nil
-        @logger = WdLogger.new (log_file || DEFAULT_LOG_FILE)
+        log_file ||= DEFAULT_LOG_FILE
+        conf_file ||= DEFAULT_CONF_FILE
+
         @trackers = {}
-        parse_conf (conf_file || DEFAULT_CONF_FILE)
+
+        @logger = WdLogger.new log_file
+        parse_conf conf_file
+
         setup
     end
 
@@ -49,35 +54,38 @@ class SysWatchdog
     def run_test test, after_restore: false
         success, exitstatus, output = test.run
 
-        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
-        end
+        notify_change test, output
+
+        return if success == test.fail
 
         if success
-            if test.fail
-                test.fail = false
-                notify "#{test.name} ok"
-            end
+            test.fail = false
+            notify "#{test.name} ok"
         else
-            unless test.fail
-                if test.restore_cmd and not after_restore
-                    test.restore
-                    run_test test, after_restore: true
-                else
-                    fail test, exitstatus, output
-                end
+            if test.restore_cmd and not after_restore
+                test.restore
+                run_test test, after_restore: true
+            else
+                fail test, exitstatus, output
             end
         end
     rescue => e
         @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
+        end
+    end
+
     def fail test, exitstatus, output
         test.fail = true
-        body = "output: #{output}" if body and not body.empty?
+        body = "exitstatus: #{exitstatus}"
+        body += "\noutput: #{output}" if output and not output.empty?
         notify "#{test.name} fail", body
     end
 end

data/lib/sys_watchdog/notify.rb

@@ -19,10 +19,10 @@ class SysWatchdog
         slack_client.chat_postMessage(channel: @conf[:slack_channel], text: "[#{server_name}] #{msg}", as_user: true)
     end
 
-    def send_mail sub, _body
+    def send_mail sub, body
         @logger.info "Sending email: #{ sub }"
 
-        body = _body || ""
+        body ||= ""
         body += append_sys_info
         
         mail = Mail.new do

data/lib/sys_watchdog/wd_test.rb

@@ -31,7 +31,7 @@ class WdTest
         end
     end
 
-    def run after_restore: false
+    def run
         @logger.info "========== testing #{@name}"
 
         unless @test_cmd
@@ -42,14 +42,14 @@ class WdTest
         exitstatus, output = run_cmd @test_cmd
 
         success = check_result exitstatus, output
-        @logger.info "success: #{success.to_s}"
+        @logger.info "success: #{success}"
 
         [success, exitstatus, output]
     end
 
     private
 
-    def run_cmd cmd, allow_raise = false
+    def run_cmd cmd
         @logger.info "run: #{ cmd }"
 
         output = IO.popen(cmd, "r") {|pipe| pipe.read}
@@ -75,17 +75,18 @@ class WdTest
     end
 
     def check_result exitstatus, output
-        success = if @expected_regex
-            output =~ @expected_regex
-        elsif @expected_string
-            output.index @expected_string
-        elsif @expected_max
-            output.to_f <= @expected_max
-        elsif @expected_min
-            output.to_f <= @expected_min
-        else
-            exitstatus == 0
-        end
+        success = 
+            if @expected_regex
+                output =~ @expected_regex
+            elsif @expected_string
+                output.index @expected_string
+            elsif @expected_max
+                output.to_f <= @expected_max
+            elsif @expected_min
+                output.to_f <= @expected_min
+            else
+                exitstatus == 0
+            end
         !!success
     end
 end

data/sys_watchdog.gemspec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys_watchdog
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tom Lobato
@@ -47,8 +47,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- CNAME
 - README.md
 - Rakefile
+- _config.yml
 - bin/sys_watchdog
 - lib/sys_watchdog.rb
 - lib/sys_watchdog/core_extensions.rb