dyn-ruby-win32daemon 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9865e3c62d77afeeb77227f4403b00e1affc9315
-  data.tar.gz: 59f745d4d7e18172d2d386cc31df64f65b78d7b9
+  metadata.gz: c787377080210db3adbd84ed6871e8195a89ada2
+  data.tar.gz: 3d1b786c61c83b54cc9c57e5a1028d8666c2b953
 SHA512:
-  metadata.gz: a090d105c804629ad0b6b95207113ca9f5f5ece176aa32c663888109f68e7c620d858792fbd3d46690461d53d8aaeaa9e82d7bea717bfdfc2c5183f00e338860
-  data.tar.gz: 8201263ce061291ec86be7ea25795a1b2cb99a7123070144ed2ccc720aaf8b5738ffca61351294b11909a98f617db3393b7d587fe61ba12f7af903877dc2e517
+  metadata.gz: 5e39713d212795d30fb1d09fb1f200887bdb20d2c07f56014a2aa5994bd3eafcc24c2df4dcb1720f0dc2d224ffcfd00fa403c3c71bde1b41f37106f22450c9d0
+  data.tar.gz: a96bff3d82c02be5928d6d70d98a4ffc771f5089b3e29de305ed4a8fa70f0f8fde3b7d7502fbee5cd6d526aff90f88c8f18732b1cd7de0b0c277f0686c851314

data/bin/dyn-daemon

@@ -1,46 +1,47 @@
 #!/usr/bin/env ruby
 require "fileutils"
-SRV=ARGV[1].strip
-exit unless ["dyn-srv","dyntask-srv"].include? SRV
+SRV=ARGV[0].strip
+exit! unless ["srv","dyntask"].include? SRV
+CMD={ "srv" => "dyn-srv", "dyntask" => "dyntask-server"}
 FileUtils.mkdir_p File.join(ENV["USERPROFILE"],"dyndoc","log")
 DYN_DAEMON_LOG_FILE = File.join(ENV["USERPROFILE"],"dyndoc","log","win32daemon_")+SRV+".log"
-DYN_DAEMON_DIR=File.dirname `where ruby`.strip
+DYN_DAEMON_DIR = File.dirname `where ruby`.strip
 
-ACTION=ARGV[2] || "status"
+require 'win32/daemon'
+require 'win32/process'
+include Win32
 
-case ACTION
-when "start"
-  begin
-    require 'win32/daemon'
-    include Win32
-
-    class DynDaemon < Daemon
-
-      def service_init
-        File.open(DYN_DAEMON_LOG_FILE, 'a'){ |f| f.puts "Initializing service #{Time.now}" }
-
-        @server_pid = Process.spawn 'dyntask-server', :chdir => DYN_DAEMON_DIR, :err => [DYN_DAEMON_LOG_FILE, 'a']
-        File.open(DYN_DAEMON_LOG_FILE, 'a'){ |f| f.puts @server_pid.inspect }
-      end
-
-      def service_main
-        File.open(DYN_DAEMON_LOG_FILE, 'a'){ |f| f.puts "Service is running #{Time.now} with pid #{@server_pid}" }
-        while running?
-          sleep 10
-        endx
-      end
-
-      def service_stop
-        File.open(DYN_DAEMON_LOG_FILE, 'a'){ |f| f.puts "Stopping server thread #{Time.now}" }
-        system "taskkill /PID #{@server_pid} /T /F"
-        Process.waitall
-        File.open(DYN_DAEMON_LOG_FILE, 'a'){ |f| f.puts "Service stopped #{Time.now}" }
-        exit!
-      end
+class DynDaemon < Daemon
+
+  def service_init
+    File.open(DYN_DAEMON_LOG_FILE, 'a'){ |f| f.puts "Initializing service #{Time.now}" }
+
+    @server_pid = Process.spawn CMD[SRV], :chdir => DYN_DAEMON_DIR, :err => [DYN_DAEMON_LOG_FILE, 'a']
+    File.open(DYN_DAEMON_LOG_FILE, 'a'){ |f| f.puts @server_pid.inspect }
+  end
+
+  def service_main
+    File.open(DYN_DAEMON_LOG_FILE, 'a'){ |f| f.puts "Service is running #{Time.now} with pid #{@server_pid}" }
+    while running?
+      sleep 10
     end
+  end
 
-    DynDaemon.mainloop
+  def service_stop
+    File.open(DYN_DAEMON_LOG_FILE, 'a'){ |f| f.puts "Stopping server thread #{Time.now}" }
+    system "taskkill /PID #{@server_pid} /T /F"
+    Process.waitall
+    File.open(DYN_DAEMON_LOG_FILE, 'a'){ |f| f.puts "Service stopped #{Time.now}" }
+    exit!
+  end
+end
+
+action = ARGV[1] || "status"
 
+case action
+when "start"
+  begin
+    DynDaemon.mainloop
   rescue Exception => e
     File.open(DYN_DAEMON_LOG_FILE,'a+'){ |f| f.puts " ***Daemon failure #{Time.now} exception=#{e.inspect}\n#{e.backtrace.join($/)}" }
     raise
@@ -50,14 +51,12 @@ when "stop"
 
   pids = []
 
-  ProcTable.ps{ |s|
-    pids.push(s.pid) if s.cmdline =~ /#{SRV}/
-  }
+  Sys::ProcTable.ps{ |s| pids.push(s.pid) if s.cmdline =~ /#{SRV}/ }
 
+ pids -= [Process.pid]
+ p pids
   p Process.kill(9,pids.last)
 when "status"
   require 'sys/proctable'
-  ProcTable.ps{ |s|
-    puts s.pid+"->"+s.cmdline if s.cmdline =~ /#{SRV}/
-  }
+  Sys::ProcTable.ps{ |s| puts s.pid.to_s+" -> "+s.cmdline if s.pid != Process.pid and s.cmdline =~ /#{SRV}/ }
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dyn-ruby-win32daemon
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - CQLS