rexec 1.6.1 → 1.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37a6927e5affd75981f84d8e7a728d78146bc3e7
-  data.tar.gz: 0918b351565eeefe516e75512e93eb2a84af45ba
+  metadata.gz: 83c8f85d6f0fe5127d00d90d12abd59c946b2370
+  data.tar.gz: a509c0b459ffdcef895ce8905e7f36a93d6fd7c3
 SHA512:
-  metadata.gz: b8303a4be5df0e6584b78b79ee0ec1d50260fc7a6150d0e3625f9a83bebcc96b221b8c3e5e615c44993195fa26fabac8cd6d105b46988c07be448d83eade5f2a
-  data.tar.gz: f43d7a09bd0d34fd6a6d82da32e38e25d4c5aa922f2118800dec78304199a75cf654f49acc427a4df5cb1e6c2426c0b96281408ef134735d4398fab84a3cd057
+  metadata.gz: b886554d41c8dfdac084351cc8990b3f54d5483cf387bc18881a663398a630829fddaa16d77bc3ac462636e832720ddc159536308b500abfa6dc7bdc2c7346da
+  data.tar.gz: 96d6ff057aeb6c5c525f0b9323ef7d54fab5f736b2324220dd240e6b3752b02a01b04d6a6bbef5ce83f277be0d1696052cfcc0063c96a475bc1aa0649d32e128

data/.travis.yml

@@ -1,8 +1,6 @@
 language: ruby
 rvm:
-  - "1.8.7"
-  - "1.9.2"
   - "1.9.3"
   - "2.0"
-  - rbx-18mode
   - rbx-19mode
+  - rbx-20mode

data/lib/rexec/daemon/base.rb

@@ -153,6 +153,8 @@ module RExec
 
 			# The main function to stop the daemon
 			def self.shutdown
+				# Interrupt all children processes, preferably to stop them so that they are not left behind.
+				Process.kill(0, :INT)
 			end
 		end
 	end

data/lib/rexec/daemon/controller.rb

@@ -89,32 +89,11 @@ module RExec
 					$stderr.sync = true
 
 					begin
-						error = nil
+						daemon.run
 						
-						main = Thread.new do
-							begin
-								daemon.run
-							rescue
-								error = $!
-							end
-						end
-
 						trap("INT") do
-							begin
-								daemon.shutdown
-								main.exit
-							rescue
-								error = $!
-							end
-						end
-
-						trap("TERM") do
-							exit!
+							daemon.shutdown
 						end
-
-						main.join
-
-						raise error if error
 					rescue
 						$stderr.puts "=== Daemon Exception Backtrace @ #{Time.now.to_s} ==="
 						$stderr.puts "#{$!.class}: #{$!.message}"
@@ -184,8 +163,8 @@ module RExec
 					return
 				end
 
-				pid = ProcessFile.recall(daemon)
-				Process.kill("INT", pid)
+				pgid = -Process.getpgid(pid)
+				Process.kill("INT", pgid)
 				sleep 0.1
 
 				sleep 1 if ProcessFile.running(daemon)
@@ -196,8 +175,8 @@ module RExec
 				while ProcessFile.running(daemon) and attempts > 0
 					sig = (attempts >= 2) ? "KILL" : "TERM"
 
-					puts "Sending #{sig} to pid #{pid}...".color(:red)
-					Process.kill(sig, pid)
+					puts "Sending #{sig} to process group #{pgid}...".color(:red)
+					Process.kill(sig, pgid)
 
 					attempts -= 1
 					sleep 1

data/lib/rexec/version.rb

@@ -19,5 +19,5 @@
 # THE SOFTWARE.
 
 module RExec
-	VERSION = "1.6.1"
+	VERSION = "1.6.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rexec
 version: !ruby/object:Gem::Version
-  version: 1.6.1
+  version: 1.6.2
 platform: ruby
 authors:
 - Samuel Williams