spoon_daemon 0.0.2 → 0.0.3

data/README.md

@@ -24,10 +24,9 @@ Or install it yourself as:
 SpoonDaemon::Runner.new('path/to/my/script.rb', cmd, options)
 ```
 
-Where cmd is 'start', 'stop' or 'restart'
-
-And options are:
- * `pid_dir`: where to create the PID file
+Where cmd is one of `start`, `stop` or `restart`, and options are:
+ * `:pid_dir`: where to create the PID file
+ * `:name`: process name, used for the PID filename
 
 
 ## Contributing

data/lib/spoon_daemon.rb

@@ -1,4 +1,5 @@
 require "spoon"
+require "timeout"
 
 require "spoon_daemon/version"
 
@@ -9,8 +10,10 @@ module SpoonDaemon
 
       @pid_dir = options[:pid_dir] || '.'
       @name = options[:name] || File.basename(script)
+      @timeout = options[:timeout] || 10
 
       @pid_path = File.join(@pid_dir, "#{@name}.pid")
+      @pid = get_pid
 
       case cmd
       when 'start'
@@ -51,29 +54,38 @@ module SpoonDaemon
     def remove_pidfile
       File.unlink(@pid_path)
     rescue => e
-      STDERR.puts "ERROR: Unable to unlink #{path}:\n\t" +
+      STDERR.puts "ERROR: Unable to unlink #{@pid_path}:\n\t" +
         "(#{e.class}) #{e.message}"
       exit
     end
 
     def process_exists?
-      pid = get_pid
-      return false unless pid
-      Process.kill(0, pid)
+      return false unless @pid
+      Process.kill(0, @pid)
       true
     rescue Errno::ESRCH, TypeError # "PID is NOT running or is zombied
       false
     rescue Errno::EPERM
-      STDERR.puts "No permission to query #{pid}!";
+      STDERR.puts "No permission to query #{@pid}!";
       false
     end
 
     def stop
-      pid = get_pid
-      Process.kill("TERM", pid)
+      abort "No process running, nothing to stop"  unless process_exists?
+
+      begin
+        STDOUT.puts "Stopping process #{@pid}..."
+        Timeout.timeout(@timeout) do
+          Process.kill("TERM", @pid)
+          sleep 1 while process_exists?
+        end
+      rescue Timeout::Error
+        STDERR.puts "Graceful shutdown timeout, sending KILL signal"
+        Process.kill("KILL", @pid)
+      end
+
       remove_pidfile
-    rescue Errno::ESRCH
-      abort "No process to kill"
+      STDOUT.puts "Process stopped."
     end
 
     def start

data/lib/spoon_daemon/version.rb

@@ -1,3 +1,3 @@
 module SpoonDaemon
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -2,7 +2,7 @@
 name: spoon_daemon
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors: 
 - Emilien Taque
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-26 00:00:00 Z
+date: 2012-12-28 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: spoon