daemonite 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e84d4f992152f3c11c7449081d617825107359b0a542feca239c102879d19719
-  data.tar.gz: e30fd22e0e5e89dd91c83777ac6fd5a78b56fa9fc5097b8dc471fd2e27023c9a
+  metadata.gz: 74f7f995baeec2a36127f05e1e0dc6dfcc9788894cd056b6d174c10e0ec8f11e
+  data.tar.gz: d17d606a20d9a0565e7b97fc573c1aa91ac3457f7160c7e0596c0aa2014e42eb
 SHA512:
-  metadata.gz: abf8a9b1943c0dcbf0eed1e1808345fcdb11720d795f8dc834d34f0a837efdd5cbc4ea2335bcd53e8ff064ff1421d72c7485be5af4636dd8bc5aac9ab98adc52
-  data.tar.gz: 5a5514461c2356de2df7d881adc455d7e6e2a0760b05f3cf3fe64aaacc100e135c9a0e55e9ca9b9d494ebce2e2b5a316c0abaa3d0041f85b7671af1614b4f39e
+  metadata.gz: 6e65fc163a6a708d13962f84ee1c805578ed4674febc152a4d95766875ccf22cb0797405cfbd438b82304837ea180935177abd71a83d92f76a63ad72dce69d9f
+  data.tar.gz: 2aa8c2c09e32284da2d2c3615d916165ec98866514987ee267e341d3decc9b359f71bfbc7e1ded31031d3cea7df485ba80d4a26cd9ef2db76183f89787132aa9

data/daemonite.gemspec

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

data/lib/daemonite.rb

@@ -19,6 +19,8 @@ require 'optparse'
 require 'psych'
 
 module Daemonism
+  @@daemonism_restart = false
+
   DAEMONISM_DEFAULT_OPTS = {
     :mode            => :debug,
     :verbose         => false,
@@ -90,59 +92,66 @@ module Daemonism
         false
       end
     end
-    if opts[:cmdl_operation] == "info" && status.call == false
-      puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}not running"
-      exit
-    end
-    if opts[:cmdl_operation] == "info" && status.call == true
-      puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}running as #{pid}"
-      begin
-        stats = `ps -o "vsz,rss,lstart,time" -p #{pid}`.split("\n")[1].strip.split(/ +/)
-        puts "Virtual:  #{"%0.2f" % (stats[0].to_f/1024)} MiB"
-        puts "Resident: #{"%0.2f" % (stats[1].to_f/1024)} MiB"
-        puts "Started:  #{stats[2..-2].join(' ')}"
-        puts "CPU Time: #{stats.last}"
-      rescue
+    unless @@daemonism_restart
+      if opts[:cmdl_operation] == "info" && status.call == false
+        puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}not running"
+        exit
+      end
+      if opts[:cmdl_operation] == "info" && status.call == true
+        puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}running as #{pid}"
+        begin
+          stats = `ps -o "vsz,rss,lstart,time" -p #{pid}`.split("\n")[1].strip.split(/ +/)
+          puts "Virtual:  #{"%0.2f" % (stats[0].to_f/1024)} MiB"
+          puts "Resident: #{"%0.2f" % (stats[1].to_f/1024)} MiB"
+          puts "Started:  #{stats[2..-2].join(' ')}"
+          puts "CPU Time: #{stats.last}"
+        rescue
+        end
+        exit
+      end
+      if %w{start}.include?(opts[:cmdl_operation]) && status.call == true
+        puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}already started"
+        exit
       end
-      exit
-    end
-    if %w{start}.include?(opts[:cmdl_operation]) && status.call == true
-      puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}already started"
-      exit
     end
 
     ########################################################################################################################
     # stop/restart server
     ########################################################################################################################
-    if %w{stop restart}.include?(opts[:cmdl_operation])
-      if status.call == false
-        puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}maybe not started?"
-      else
-        puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}stopped"
-        puts "Waiting while server goes down ..."
-        while status.call
-          Process.kill "SIGTERM", pid
-          sleep 0.3
+    unless @@daemonism_restart
+      if %w{stop restart}.include?(opts[:cmdl_operation])
+        if status.call == false
+          puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}maybe not started?"
+        else
+          puts "Server #{opts[:cmdl_info].nil? ? '' : '(' + opts[:cmdl_info].to_s + ') '}stopped"
+          puts "Waiting while server goes down ..."
+          while status.call
+            Process.kill "SIGTERM", pid
+            sleep 0.3
+          end
         end
+        exit unless opts[:cmdl_operation] == "restart"
       end
-      exit unless opts[:cmdl_operation] == "restart"
     end
 
     ########################################################################################################################
     # go through user defined startup thingis
     ########################################################################################################################
-    opts[:runtime_cmds].each do |ro|
-      ro[2].call(status.call) if opts[:cmdl_operation] == ro[0]
-    end
+    unless @@daemonism_restart
+      opts[:runtime_cmds].each do |ro|
+        ro[2].call(status.call) if opts[:cmdl_operation] == ro[0]
+      end
+      @@daemonism_restart = true
 
-    retain = $stdout.dup
-    Process.daemon(opts[:basepath]) 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
+      retain = $stdout.dup
+      Process.daemon(opts[:basepath]) 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
+      end
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: daemonite
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Juergen eTM Mangler