process-daemon 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7db4156d137b48f2986d06e6dfd5f1b5150d8afb
-  data.tar.gz: fec53d11a1bea87a073f68f9829edbfbafc2826c
+  metadata.gz: 9ac6a1383d85f2ac030dd67378c030b390ec8e57
+  data.tar.gz: bf7e354b299aa95289c9413f6433f05c3e089e1c
 SHA512:
-  metadata.gz: 4e3b5741338cba187cba99156ee755812a8ada36ab4022cda60a870e19f87e2d373942a67567d387d00301e25becb86180cdf05726291a3976a8f320309eb7ee
-  data.tar.gz: da7769da5b93b2edd49541fcdb47615f6e2709765ebe38879ea87459aa899b4ba62be208a9c8c335f6606572b691fbd3ce35ebe8b4326705060c69c4efa8b367
+  metadata.gz: f2dd1c47ad979b2799212c33db7794254a5b732a84bdb55076ee4725936c4f2c3dd40eea3a70f21f8663946208391d2b12b300e9e0f22f655f885fbfbf0925f4
+  data.tar.gz: de24582d288d5299e142c6a094eaabda43cc8f73fe512f660a114d5aa7de235e04fd835efec09d9aec5f26bfdd609f35ecc8f91cd6a18a2500e7180bc86cac0f

data/README.md

@@ -75,3 +75,27 @@ Then run `daemon.rb start`. To stop the daemon, run `daemon.rb stop`.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## License
+
+Released under the MIT license.
+
+Copyright, 2014, by [Samuel G. D. Williams](http://www.codeotaku.com/samuel-williams).
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/lib/process/daemon.rb

@@ -131,11 +131,11 @@ module Process
 		end
 		
 		def run
-			startup
-			
 			trap("INT") do
 				shutdown
 			end
+			
+			startup
 		end
 		
 		# A shared instance of the daemon.

data/lib/process/daemon/controller.rb

@@ -32,6 +32,9 @@ module Process
 				@daemon = daemon
 				
 				@output = options[:output] || $stdout
+				
+				# How long to wait until sending SIGTERM and eventually SIGKILL to the daemon process group when asking it to stop:
+				@stop_timeout = options[:stop_timeout] || 10.0
 			end
 			
 			# This function is called from the daemon executable. It processes ARGV and checks whether the user is asking for `start`, `stop`, `restart`, `status`.
@@ -151,6 +154,9 @@ module Process
 				return daemon_state
 			end
 
+			# How long to wait between checking the daemon process when shutting down:
+			STOP_PERIOD = 0.1
+
 			# Stops the daemon process.
 			def stop
 				@output.puts Rainbow("Stopping daemon...").blue
@@ -175,15 +181,16 @@ module Process
 				# Interrupt the process group:
 				pgid = -Process.getpgid(pid)
 				Process.kill("INT", pgid)
-				sleep 0.1
 
-				sleep 1 if ProcessFile.running(@daemon)
+				(@stop_timeout / STOP_PERIOD).to_i.times do
+					sleep STOP_PERIOD if ProcessFile.running(@daemon)
+				end
 
 				# Kill/Term loop - if the @daemon didn't die easily, shoot
 				# it a few more times.
 				attempts = 5
 				while ProcessFile.running(@daemon) and attempts > 0
-					sig = (attempts >= 2) ? "KILL" : "TERM"
+					sig = (attempts <= 2) ? "KILL" : "TERM"
 
 					@output.puts Rainbow("Sending #{sig} to process group #{pgid}...").red
 					Process.kill(sig, pgid)

data/lib/process/daemon/version.rb

@@ -20,6 +20,6 @@
 
 module Process
 	class Daemon
-		VERSION = "0.5.0"
+		VERSION = "0.5.1"
 	end
 end

data/test/test_daemon.rb

@@ -57,14 +57,14 @@ class XMLRPCDaemon < Process::Daemon
 
 		@rpc_server.mount("/RPC2", @listener)
 
-		$stdout.flush
-		$stderr.flush
-		
 		begin
+			puts "Daemon starting..."
 			@rpc_server.start
+			puts "Daemon stopping..."
 		rescue Interrupt
 			puts "Daemon interrupted..."
 		ensure
+			puts "Daemon shutdown..."
 			@rpc_server.shutdown
 		end
 	end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: process-daemon
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Samuel Williams
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-13 00:00:00.000000000 Z
+date: 2014-05-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow