daemonite 0.5.3 → 0.5.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b38490b5b0512257356f5a795ae21892db6f3908bc2dd574e8c892b6ceeb49e
-  data.tar.gz: c2303181b47f5e2af0377c5237b0b802d12359767c77d28f115729d8b28cf344
+  metadata.gz: e7171fd2b57ae339e62582e061674b842acf8f9a27ab5af76911db78f8508888
+  data.tar.gz: a94b9770dfe0fc681a3f2d3949d1251cee757dafa45c6a7a4e78e54545a4f7e8
 SHA512:
-  metadata.gz: c343e7e31472ee931a009fc0c15da8a48ebbd6285c30ef190cc5fa330712781a0bb652033ee043d6f0122fb531fea27d0be1571c6364d83bb69170120697f351
-  data.tar.gz: bf82bbea8ff912c127d8b77e9b2ebf4435b330dcb66ca001df9816864f0f8addd148e18bd245908b8536eec6314be271429295cc80480ed4fe620ed544f088ed
+  metadata.gz: f2795a00b76410582129a9dabdc9340ca01dd120d12491d550bbbc16fa1300f1d9404eb3bd07b8b6a6bf40ad94c08c06f1f2dbddea2f6da6ae8473e4feef0552
+  data.tar.gz: 6c523afdded907f6d346908b95a7d6fed4218e1dba5ce45d96bf631afa1165bc52be9cbd2517bdbddbff18ad996607b6fb53ea4d827aef230760340139801185

data/Rakefile

@@ -1,19 +1,22 @@
 require 'rake'
 require 'rubygems/package_task'
-require 'rake/testtask'
+require 'fileutils'
 
 spec = eval(File.read('daemonite.gemspec'))
 Gem::PackageTask.new(spec) do |pkg|
   pkg.need_zip = true
   pkg.need_tar = true
-  `rm pkg/* -rf`
-  `ln -sf #{pkg.name}.gem pkg/daemonite.gem`
+  FileUtils.mkdir 'pkg' rescue nil
+  FileUtils.rm_rf Dir.glob('pkg/*')
+  FileUtils.ln_sf "#{pkg.name}.gem", "pkg/#{spec.name}.gem"
 end
 
+task :default => :gem
+
 task :push => :gem do |r|
-  `gem push pkg/daemonite.gem`
+  `gem push pkg/#{spec.name}.gem`
 end
 
 task :install => :gem do |r|
-  `gem install pkg/daemonite.gem`
+  `gem install pkg/#{spec.name}.gem`
 end

data/daemonite.gemspec

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

data/lib/daemonite.rb

@@ -33,7 +33,8 @@ module Daemonism
     :runtime_proc    => nil,
     :cmdl_info       => nil,
     :cmdl_parsing    => true,
-    :cmdl_operation  => 'start'
+    :cmdl_operation  => 'start',
+    :kill_amount     => 1000
   }
 
   def daemonism(opts={},&block)
@@ -128,8 +129,16 @@ module Daemonism
         else
           puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}stopped"
           puts "Waiting while server goes down ..."
+          count = 0
           while status.call
-            Process.kill "SIGTERM", pid
+            if count > opts[:kill_amount]
+              Process.kill "SIGKILL", pid
+              File.unlink(opts[:basepath] + '/' + opts[:pidfile])
+              @at_exit.call(opts) if @at_exit
+            else
+              Process.kill "SIGTERM", pid
+            end
+            count += 1
             sleep 0.3
           end
         end
@@ -147,13 +156,13 @@ module Daemonism
       @@daemonism_restart = true
 
       retain = $stdout.dup
-      Process.daemon(opts[:basepath]) unless opts[:verbose]
+      Process.daemon unless opts[:verbose]
       retain.puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}started as PID:#{Process.pid}"
       File.write(opts[:basepath] + '/' + opts[:pidfile],Process.pid) # after daemon, so that we get the forked pid
       Dir.chdir(opts[:basepath])
       ::Kernel::at_exit do
         File.unlink(opts[:basepath] + '/' + opts[:pidfile])
-        @at_exit.call if @at_exit
+        @at_exit.call(opts) if @at_exit
       end
     end
   end
@@ -174,6 +183,9 @@ module Daemonism
   def on_startup(&blk)
     on :startup, &blk
   end
+  def use(blk)
+    instance_eval(&blk)
+  end
   alias_method :at, :on
   alias_method :at_exit, :on_exit
   alias_method :at_startup, :on_startup
@@ -193,7 +205,7 @@ class Daemonite
 
   def go!
     begin
-      @at_startup.call if @at_startup
+      @at_startup.call(@opts) if @at_startup
       @opts[:block].call(@opts)
     rescue SystemExit, Interrupt
       puts "Server stopped due to interrupt (PID:#{Process.pid})"
@@ -204,7 +216,7 @@ class Daemonite
 
   def loop!
     begin
-      @at_startup.call if @at_startup
+      @at_startup.call(@opts) if @at_startup
       loop do
         @opts[:block].call(@opts)
       end unless @opts[:block].nil?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemonite
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.8
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-27 00:00:00.000000000 Z
+date: 2020-07-02 00:00:00.000000000 Z
 dependencies: []
 description: Daemonite - Process.daemon and argparse wrapper for loopies.
 email: juergen.mangler@gmail.com
@@ -44,8 +44,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Daemonite - Process.daemon and argparse wrapper for loopies.