daemonite 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 74f7f995baeec2a36127f05e1e0dc6dfcc9788894cd056b6d174c10e0ec8f11e
-  data.tar.gz: d17d606a20d9a0565e7b97fc573c1aa91ac3457f7160c7e0596c0aa2014e42eb
+  metadata.gz: a2aefaeee8ed856d896cb663cc2c2d8666f437e948e172d3d4f3bb8f8ac2bad5
+  data.tar.gz: 18face311c11441c3baa56eb74586bd13a2dc2fce37efd4475b4963121ae8b2f
 SHA512:
-  metadata.gz: 6e65fc163a6a708d13962f84ee1c805578ed4674febc152a4d95766875ccf22cb0797405cfbd438b82304837ea180935177abd71a83d92f76a63ad72dce69d9f
-  data.tar.gz: 2aa8c2c09e32284da2d2c3615d916165ec98866514987ee267e341d3decc9b359f71bfbc7e1ded31031d3cea7df485ba80d4a26cd9ef2db76183f89787132aa9
+  metadata.gz: 481799bb690fec6d0090db1ff7e762ebf00ea65248c9b5a21311058b49b5661eb141c5f6dd930850c8e53d8f3809f668aedbe585702f337d8674061fef6fb009
+  data.tar.gz: 015b1b64ebe9e4f954275c8e526c9f5de27a1ee52d5c5b965d0284e7bff355a342db2d2dfda9af62070aff3cbec23444efb42ec3771cc8083f9547a36ac8ee57

data/daemonite.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "daemonite"
-  s.version          = "0.4.2"
+  s.version          = "0.5.0"
   s.platform         = Gem::Platform::RUBY
   s.license          = "LGPL-3.0"
   s.summary          = "Daemonite - Process.daemon and argparse wrapper for loopies."

data/lib/daemonite.rb

@@ -37,6 +37,9 @@ module Daemonism
   }
 
   def daemonism(opts={},&block)
+    @at_exit = nil
+    @at_start = nil
+
     if File.exists?(opts[:basepath] + '/' + opts[:conffile])
       opts.merge!(Psych::load_file(opts[:basepath] + '/' + opts[:conffile]))
     end
@@ -70,12 +73,12 @@ module Daemonism
         end
         opt.parse!
       }
-      unless (%w{start stop restart info} + opts[:runtime_cmds].map{|ro| ro[0] }).include?(ARGV[0])
+
+      unless (%w{start stop restart} + opts[:runtime_cmds].map{|ro| ro[0] }).include?(ARGV[0])
         puts ARGV.options
-        exit
+        exit!
       end
       opts[:cmdl_operation] = ARGV[0]
-      @at_exit = nil
     end
     ########################################################################################################################
     opts[:runtime_proc].call(opts) unless opts[:runtime_proc].nil?
@@ -155,9 +158,25 @@ module Daemonism
     end
   end
 
-  def at_exit(&blk)
-    @at_exit = blk
+  def on(event,&blk)
+    case event
+      when :exit
+        @at_exit = blk
+      when :startup
+        @at_startup = blk
+    end
+  end
+  def exit; :exit; end
+  def startup; :startup; end
+  def on_exit(&blk)
+    on :exit, &blk
+  end
+  def on_startup(&blk)
+    on :startup, &blk
   end
+  alias_method :at, :on
+  alias_method :at_exit, :on_exit
+  alias_method :at_startup, :on_startup
 end
 
 class Daemonite
@@ -174,7 +193,10 @@ class Daemonite
 
   def go!
     begin
+      @at_startup.call if @at_startup
       @opts[:block].call(@opts)
+    rescue SystemExit, Interrupt
+      puts "Server stopped due to interrupt (PID:#{Process.pid})"
     rescue => e
       puts "Server stopped due to error (PID:#{Process.pid})"
     end
@@ -182,9 +204,12 @@ class Daemonite
 
   def loop!
     begin
+      @at_startup.call if @at_startup
       loop do
         @opts[:block].call(@opts)
       end unless @opts[:block].nil?
+    rescue SystemExit, Interrupt
+      puts "Server stopped due to interrupt (PID:#{Process.pid})"
     rescue => e
       puts "Server stopped due to error (PID:#{Process.pid})"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemonite
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-23 00:00:00.000000000 Z
+date: 2019-04-27 00:00:00.000000000 Z
 dependencies: []
 description: Daemonite - Process.daemon and argparse wrapper for loopies.
 email: juergen.mangler@gmail.com