with_pid 0.1.4 → 0.1.5

data/require.rb

@@ -13,7 +13,7 @@ Require do
     name 'with_pid'
     homepage "http://github.com/winton/#{name}"
     summary "The simple way to create and monitor a Ruby daemon"
-    version '0.1.4'
+    version '0.1.5'
   end
   
   rakefile do

data/templates/bash.erb

@@ -22,15 +22,24 @@ case "<%= options[:action] %>" in
       rm -f $PID_FILE
     fi
     echo $$ > $PID_FILE;
-<% if RUBY_PLATFORM.include?('darwin') %>
-		exec 2<&1 "$COMMAND"
-<% else %>
-		exec 2<&1 su -c"$COMMAND"
-<% end %>
+    eval "$COMMAND"
     ;;
   stop)
     echo "Stopping <%= options[:name] %>"
     if [ -f $PID_FILE ]; then
+      for child in $(ps axo pid,ppid  |  awk "{ if ( \$2 == `cat $PID_FILE` ) { print \$1 }}"); 
+      do 
+        kill -15 $child; 
+        SLEEP_COUNT=0
+        while [ -e /proc/$child ]; do
+          sleep .25 
+          let "SLEEP_COUNT+=1"
+          if(( "$SLEEP_COUNT" > 240 )); then
+            kill -9 $child 2>/dev/null; true
+            break 
+          fi
+        done 
+      done
       kill -15 `cat $PID_FILE` 2>/dev/null; true
     fi
     [ -e "$PID_FILE" ] && rm -f $PID_FILE

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: with_pid
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: false
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Winton Welsh