daemonite 0.5.4 → 0.5.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7bf15c0fa4ea62517072d96d7b704f3f32d73ec3e8748d2adc78fc00eb272180
-  data.tar.gz: 15d7a4efb274e29458e5fb630d3c7660b8acc382773bfaad83176aa4861dc879
+  metadata.gz: dc0e44a0c6de00925ca5424245b89a85cd8d63c79c93d84892ae39d69b326373
+  data.tar.gz: af45d64c6a065187ef9dc55e3cd025fb56f3b32727f355485253261071d553bf
 SHA512:
-  metadata.gz: 130d13d883e9f6fb5b91a07c252f4e4bc97597f63bd230a030357a2aa3e60ba4ccf8a69b38cfa74682cd7d1f2d92ee9319bea6a86ab0ea876af9a84a817b2a4e
-  data.tar.gz: a81bedf2c961cdb865ea9ff9aa53e0aa2354dfbedeb4d672ad199de76a338b50fa6a92cf76299767662393301c7a6f6357f41feaa7065afdd6b9d464e782297a
+  metadata.gz: 62ec081eac7a40da7a5870e657e5b8f9257e145339d1b59fbf287c3e0d7c44de0bb7e86e4324fffeac858ac498824c6a974f37bb88b1a43fba92fd422c0201d7
+  data.tar.gz: 11696919c2c13ed8efdc6b297600224ba84a1f0e5a91def24936c3d495c195583e3f44e1ccc8237382cf9776d15005ad92891122d272ca81dcb9b8e154154e52

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.4"
+  s.version          = "0.5.9"
   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,15 @@ 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])
+            else
+              Process.kill "SIGTERM", pid
+            end
+            count += 1
             sleep 0.3
           end
         end
@@ -147,7 +155,7 @@ 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])
@@ -174,6 +182,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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemonite
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.9
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-28 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.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Daemonite - Process.daemon and argparse wrapper for loopies.