sys_watchdog 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c65f4287817a6e1f2172b9e469d0fb32a189b068
-  data.tar.gz: 46f817b7f6ff8f51dc10cdaa802917edaacd7848
+  metadata.gz: 38d49b5c78ca9aede0efaf95fecb8c848ca29dbf
+  data.tar.gz: 661379cb8e89a88f7bfa1fae44b8105d309b87d7
 SHA512:
-  metadata.gz: 42693ebbb818cd1549d84a64a49fafff8c0ad68f040312207b6746b41be5a26b3be81b43332dea14ab8d49b47119ffa87849382f12a6b7b0b24184969e38d3a9
-  data.tar.gz: 53258664dc476766e42f8320f597da4df72390b7ce9e6bd1a16839b7ba53634374134728140dd3cfa12a3d54a696dd0696bfe1530a51dd4e431e48792d30155e
+  metadata.gz: 3e85c879f9473c5c70fdf3c297142f09190b7a13750e52bf7bbc2f4429d9077149da91313644e27afb6c6a8ae8920a8ef792c453227547f674a8d52935e98835
+  data.tar.gz: 940353576406de5755b14be0688e9d7d300afa01b5ede1601e18f8b641cf854d613c677a4a53a4b2cc06a49eecfe5112a299b0637f9792eefa9f770ac6d74e18

data/bin/sys_watchdog

@@ -4,11 +4,8 @@ require 'sys_watchdog'
 
 case ARGV[0]
 
-when 'setup_with_systemd'
-  Setup.new.with_systemd
-
-when 'setup_with_cron'
-  Setup.new.with_cron
+when %w(setup start stop uninstall)
+  Setup.new.send ARGV[0].to_sym
 
 when 'test'
   sw = SysWatchdog.new log_file: STDOUT

data/lib/sys_watchdog/main.rb

@@ -1,6 +1,9 @@
 class SysWatchdog
     DEFAULT_CONF_FILE = '/etc/sys_watchdog.yml'
     DEFAULT_LOG_FILE  = '/var/log/sys_watchdog.log'
+    WORKING_DIR = '/var/local/sys_watchdog'
+    CRONJOB_PATH = '/etc/cron.d/sys_watchdog'
+    INSTALL_TYPE_PATH = "#{WORKING_DIR}/install_type"
 
     def initialize conf_file: nil, log_file: nil
         log_file  ||= DEFAULT_LOG_FILE

data/lib/sys_watchdog/setup.rb

@@ -1,52 +1,127 @@
 
 class Setup
+  SYSTEMD_SERVICES_DIR = "/lib/systemd/system/"
+  SYSTEMD_SERVICE_FILE = "#{SYSTEMD_SERVICES_DIR}/sys-watchdog.service"
+
   def initialize
     @thisdir = File.join File.dirname(__FILE__)
   end
 
-  def with_systemd
+  def setup
+    check_root
     copy_sample_conf
-    install_systemd_service
+    create_working_dir
+    install_type = get_install_type
+    save_install_type install_type
+    case install_type
+    when 'systemd'
+      install_systemd_service
+    when 'cron'
+      install_cronjob
+    end
+    setup_finished_msg
+  end
 
-    puts "Installed."
+  def start
+    case read_install_type
+    when 'systemd'
+      run 'systemctl start sys-watchdog'
+    when 'cron'
+      rewrite_cronjob true
+    end
+  end
 
-    puts "\nEdit #{SysWatchdog::DEFAULT_CONF_FILE} and start:"
-    puts "systemctl start sys-watchdog"
+  def stop
+    case read_install_type
+    when 'systemd'
+      run 'systemctl stop sys-watchdog'
+    when 'cron'
+      rewrite_cronjob false
+    end
+  end
 
-    puts "\nTo check daemon status:"
-    puts "systemctl status sys-watchdog"
+  def uninstall
+    stop
+    File.delete SysWatchdog::DEFAULT_CONF_FILE
+    if File.exist?(SYSTEMD_SERVICE_FILE)
+      run 'systemctl disable sys-watchdog'
+      File.delete SYSTEMD_SERVICE_FILE
+    end
+    if File.exist?(SysWatchdog::CRONJOB_PATH)
+      File.delete SysWatchdog::CRONJOB_PATH
+    end
+    FileUtils.rm_rf SysWatchdog::WORKING_DIR
+    puts "Uninstall complete."
   end
 
-  def with_cron
-    copy_sample_conf
-    add_cron_line
+  private
 
-    puts "Installed."
+  def setup_finished_msg
+    puts "Installed.\n"
+    puts "Now:"
+    puts "1) Edit #{SysWatchdog::DEFAULT_CONF_FILE} to customize your system tests. You can run 'sys_watchdog test' to adjust your system tests and get a grasp of the sys_watchdog operation."
+    puts "2) After have your system tests configured run 'sys_watchdog start'"
+  end
 
-    puts "\nEdit #{SysWatchdog::DEFAULT_CONF_FILE} and uncomment the cron line added."
+  def is_setup?
+    File.exist?(SysWatchdog::DEFAULT_CONF_FILE) &&
+    (File.exist?(SysWatchdog::CRONJOB_PATH) || File.exist?(SYSTEMD_SERVICE_FILE))
+  end
+
+  def has_systemd?
+    File.exist?(`which systemctl`) && 
+    File.writable?('/lib/systemd/system')
+  end
+
+  def rewrite_cronjob enable
+    c = File.read SysWatchdog::CRONJOB_PATH
+    c.gsub! /^\s*#\s*/, (enable ? '' : '#')
+    File.write SysWatchdog::CRONJOB_PATH, c
   end
   
-  private
+  def save_install_type install_type
+    File.write SysWatchdog::INSTALL_TYPE_PATH,
+               install_type
+  end
 
-  def add_cron_line
-    run "echo '#* *   * * * root /bin/bash -lc \'sys_watchdog once\' >> /etc/crontab"
+  def read_install_type
+    return unless File.exists? SysWatchdog::INSTALL_TYPE_PATH
+    File.read SysWatchdog::INSTALL_TYPE_PATH
   end
 
-  def install_systemd_service
-    services_dir = "/lib/systemd/system/"
+  def get_install_type
+    has_systemd? ? 'systemd' : 'cron'
+  end
+
+  def check_root
+    unless Process.uid == 0
+      STDERR.puts "Install requires root privileges. Run with sudo or login as root. Aborting."
+      exit 1
+    end
+  end
+
+  def create_working_dir
+    FileUtils.mkdir_p SysWatchdog::WORKING_DIR
+  end
 
+  def install_cronjob
+    File.write SysWatchdog::CRONJOB_PATH, 
+               "#* *   * * * root /bin/bash -lc 'sys_watchdog once' >> /etc/crontab"
+  end
+
+  def install_systemd_service
     if `which systemctl`.empty?
       STDERR.puts "SysWatchdog install requires systemctl. Aborting."
       exit 1
     end
 
-    unless File.exist? services_dir
-      STDERR.puts "SysWatchdog install requires dir #{services_dir}. Aborting."
+    unless File.exist? SYSTEMD_SERVICES_DIR
+      STDERR.puts "SysWatchdog install requires dir #{SYSTEMD_SERVICES_DIR}. Aborting."
       exit 1
     end
     
     copy "#{@thisdir}/../../util/sys-watchdog.service", 
-         services_dir
+         SYSTEMD_SERVICE_FILE
 
     run 'systemctl enable sys-watchdog'
   end

data/sys_watchdog.gemspec

@@ -1,10 +1,10 @@
 Gem::Specification.new do |s|
   s.name          = "sys_watchdog"
-  s.version       = "0.1.8"
+  s.version       = "0.1.9"
   s.authors       = ["Tom Lobato"]
   s.email         = "lobato@bettercall.io"
   s.homepage      = "http://sys-watchdog.bettercall.io/"
-  s.summary       = "SysWatchdog keeps your *NIX servers green by performing periodic checks and optionally actions like service restarts and notifications."
+  s.summary       = "sys_watchdog keeps your *NIX servers green by performing periodic checks and optionally actions like service restarts and notifications."
   s.description   = "#{s.summary} https://github.com/tomlobato/sys_watchdog http://sys-watchdog.bettercall.io."
   s.licenses      = ["MIT"]
   s.platform      = Gem::Platform::RUBY

data/util/sys-watchdog.service

@@ -6,6 +6,7 @@ Description=sys_watchdog supervisor
 User=root
 Group=root
 Restart=on-failure
+WorkingDirectory=/var/local/sys_watchdog
 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.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Tom Lobato
@@ -38,7 +38,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.1
-description: SysWatchdog keeps your *NIX servers green by performing periodic checks
+description: sys_watchdog keeps your *NIX servers green by performing periodic checks
   and optionally actions like service restarts and notifications. https://github.com/tomlobato/sys_watchdog
   http://sys-watchdog.bettercall.io.
 email: lobato@bettercall.io
@@ -93,8 +93,8 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: SysWatchdog keeps your *NIX servers green by performing periodic checks and
-  optionally actions like service restarts and notifications.
+summary: sys_watchdog keeps your *NIX servers green by performing periodic checks
+  and optionally actions like service restarts and notifications.
 test_files:
 - test/sys_watchdog_test.yml
 - test/test_sys_watchdog.rb