sys_watchdog 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f967392868433183e78167d57bb19148cec58de
-  data.tar.gz: b78f4a2e2906e752139cc1f79161fc3b4ee0259b
+  metadata.gz: 63f809a622a062379d83d46e692ad7eaeaace9f5
+  data.tar.gz: 163db8efeb1271d866c59e5202dc43123028c71e
 SHA512:
-  metadata.gz: 324baced42509f03a10e7d21b43a265621e61587b03413577caa99fd81154a7a96db6b43d20f221fbf76201cc2a752373eabe7aac6adc34e800dbbefccca7634
-  data.tar.gz: 3d24f44cd12e2b18d29d4c4eee39650deca78b21ef9aae4197c5cd5f9cdc1a5c6fb75d428541de35721e74aa9c54654a02270ea8ae6ea8570e499d15b253b9d5
+  metadata.gz: 4fca59fb5a74e5aa360d3d4fa954a94737083a5fe1240dcaa8861344e65baa8b2a0f85ccffc5f3e72ef870f8f0b9d828c18ef9d51f37a307fcb93ff40df1208c
+  data.tar.gz: 2db6802883e063bc72d94a8975d8d55cee7902c1f5e0eb032b7915c3a8a9079ff1d17f0ca4863cb4efaeb3a710edcda463e80f8fa4c914064ca37f90e39b4513

data/README.md

@@ -1,12 +1,13 @@
-Sys Watchdog
+sys_watchdog
 =================
 
 [![Gem Version](https://badge.fury.io/rb/sys_watchdog.svg)](https://badge.fury.io/rb/sys_watchdog)
 [![Code Climate](https://codeclimate.com/github/tomlobato/sys_watchdog.svg)](https://codeclimate.com/github/tomlobato/sys_watchdog)
-
+![](http://ruby-gem-downloads-badge.herokuapp.com/sys_watchdog?type=total&label=gem%20downloads)
+ 
 By [Bettercall.io](https://bettercall.io/).
 
-SysWatchdog keeps your *NIX servers green by performing periodic checks and optionally actions like service restarts and notifications.  
+sys_watchdog keeps your *NIX servers green by performing periodic checks and optionally actions like service restarts and notifications.  
 
 Take 20min to install and start to think what you\`ll make with your spare time ;)
 

data/TODO

@@ -19,4 +19,8 @@ flexibilize period, currently hardcoded to 60s
 
 Lockfile for process
 
-lock for sys tests
+lock for sys tests
+
+remove slack-ruby-client from Gemfile. If it is set in .yml and is not available, send a error to log with instructions to install.
+
+adjusts dependencies verions

data/bin/sys_watchdog

@@ -5,10 +5,10 @@ require 'sys_watchdog'
 case ARGV[0]
 
 when 'setup_with_systemd'
-  Setup.new.setup_with_systemd
+  Setup.new.with_systemd
 
 when 'setup_with_cron'
-  Setup.new.setup_with_cron
+  Setup.new.with_cron
 
 when 'test'
   sw = SysWatchdog.new log_file: STDOUT

data/lib/sys_watchdog/main.rb

@@ -29,8 +29,9 @@ class SysWatchdog
             end
         end
         if @conf.smtp_server
+            _conf = @conf
             Mail.defaults do
-              delivery_method :smtp, address: @conf.smtp_server, port: 587, :domain => @conf.smtp_domain, 
+              delivery_method :smtp, address: _conf.smtp_server, port: 587, :domain => _conf.smtp_domain, 
                               :enable_starttls_auto => true, :openssl_verify_mode => 'none'
             end
         end
@@ -80,7 +81,7 @@ class SysWatchdog
                 test.restore
                 run_test test, after_restore: true
             else
-                fail test, exitstatus, output
+                fail test, output
             end
         end
     rescue => e
@@ -94,9 +95,9 @@ class SysWatchdog
         end
     end
 
-    def fail test, exitstatus, output
-        body = "exitstatus: #{exitstatus}"
-        body += "\noutput: #{output}" if output and not output.empty?
+    def fail test, output
+        body = ""
+        body += "output: #{output}" if output and not output.empty?
         notify "#{test.name} fail", body
     end
 end

data/lib/sys_watchdog/notify.rb

@@ -36,7 +36,7 @@ class SysWatchdog
     end
 
     def server_name
-        @conf.server_name || `hostname`
+        @conf.server_name || `hostname`.strip
     end
 
     def append_sys_info

data/lib/sys_watchdog/setup.rb

@@ -11,10 +11,10 @@ class Setup
     puts "Installed."
 
     puts "\nEdit #{SysWatchdog::DEFAULT_CONF_FILE} and start:"
-    puts "systemctl start sys_watchdog"
+    puts "systemctl start sys-watchdog"
 
     puts "\nTo check daemon status:"
-    puts "systemctl status sys_watchdog"
+    puts "systemctl status sys-watchdog"
   end
 
   def with_cron
@@ -29,7 +29,7 @@ class Setup
   private
 
   def add_cron_line
-    run "echo '#* *   * * * root sys_watchdog once' >> /etc/crontab"
+    run "echo '#* *   * * * root /bin/bash -lc \'sys_watchdog once\' >> /etc/crontab"
   end
 
   def install_systemd_service
@@ -45,10 +45,10 @@ class Setup
       exit 1
     end
     
-    copy "#{@thisdir}/../../util/sys_watchdog.service", 
+    copy "#{@thisdir}/../../util/sys-watchdog.service", 
          services_dir
 
-    run 'systemctl enable sys_watchdog'
+    run 'systemctl enable sys-watchdog'
   end
 
   def copy_sample_conf

data/sys_watchdog.gemspec

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

data/util/sys-watchdog.service

@@ -0,0 +1,11 @@
+
+[Unit]
+Description=sys_watchdog supervisor
+
+[Service]
+User=root
+Group=root
+Restart=on-failure
+ExecStart=/bin/bash -lc 'sys_watchdog'
+StandardOutput=syslog
+StandardError=syslog

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sys_watchdog
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Tom Lobato
@@ -68,7 +68,7 @@ files:
 - sys_watchdog.gemspec
 - test/sys_watchdog_test.yml
 - test/test_sys_watchdog.rb
-- util/sys_watchdog.service
+- util/sys-watchdog.service
 - util/sys_watchdog_sample.yml
 homepage: http://sys-watchdog.bettercall.io/
 licenses:

data/util/sys_watchdog.service

@@ -1,11 +0,0 @@
-
-[Unit]
-Description=SysWatchdog supervisor
-
-[Service]
-User=root
-Group=root
-WorkingDirectory=/var/local/sys_watchdog
-Restart=on-failure
-ExecStart=/usr/local/sys_watchdog/sys_watchdog
-