daemonite 0.5.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d80e2f0268b9385c864ebe15b2f0f728b2acbb3d4205115722abd3d308b0267d
-  data.tar.gz: 5b90f90695c57d08524b5d64d4579f230faa44981abd457e4291ecf806c45629
+  metadata.gz: fd02605e10df3a5a47877ab9a0c1212eb565a7606cdcdee6b2339cfd628bacf8
+  data.tar.gz: a89cd8b6da35b87c7ac679b607bc4ae8886546402218bcbe9367d7281ffff4e8
 SHA512:
-  metadata.gz: 4a6ad8f8b8847dee5cc599e1effc3c68fd5d595688f55cff5db9488a949acb4a176f14197d615d0cb60bd69b1d8cbf96933744085a511cd4bc0124821fcd53aa
-  data.tar.gz: 399d6e45ecbd5055cec2f0ce6ef4a5f6bc9b478938e70523957568a843f4845a2c5d31c65c5ada3a41e92c2e54bad6725e8e766c10312664281a5aef3578c8fc
+  metadata.gz: f31aa4941704d843513bec86f6e4cd6049b95c853c9c65fe7b80d6ede6148be45b069fadb06ffe8be3f77f93d483bdc8da648a9f5ac980e44a525bcb78c7a76b
+  data.tar.gz: 17f2e8d7561787f8f2ed6ecfa95d62d3af8a4eb5e29a000413fb48ca53ce7d4bb7b45921d788c713c6ab65a23594e3bb62034b2204e2a05da7098ac0e283d664

data/daemonite.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name             = "daemonite"
-  s.version          = "0.5.5"
+  s.version          = "0.6.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

@@ -33,7 +33,8 @@ module Daemonism
     :runtime_proc    => nil,
     :cmdl_info       => nil,
     :cmdl_parsing    => true,
-    :cmdl_operation  => 'start'
+    :cmdl_operation  => 'start',
+    :kill_amount     => 100
   }
 
   def daemonism(opts={},&block)
@@ -128,8 +129,19 @@ 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
+              if opts[:cmdl_operation] == 'stop'
+                Process.kill "SIGTERM", pid
+              else
+                Process.kill "SIGHUP", pid
+              end
+            end
+            count += 1
             sleep 0.3
           end
         end
@@ -147,7 +159,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])

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daemonite
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Juergen eTM Mangler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-29 00:00:00.000000000 Z
+date: 2020-10-03 00:00:00.000000000 Z
 dependencies: []
 description: Daemonite - Process.daemon and argparse wrapper for loopies.
 email: juergen.mangler@gmail.com