symphony 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: edb7810dc562110768235353536ec4a000b02828
-  data.tar.gz: c0a047b0115a9a865ce90606478091e814ab23f5
+  metadata.gz: 27cfb2845ca71c3af5596979ce84fb19c9a3ba6e
+  data.tar.gz: f475feb878e9abf0be8f4fc16fd90f86d7d04193
 SHA512:
-  metadata.gz: 26eeea9cdd2546eeb51cf3f6f936e59a69886c0f83d431e8c770ce758564df01153cb710ff73abbb36fd9525f1234f3912f0fc74cb6bc0c01e14df1af437a854
-  data.tar.gz: ab8aa95349260ee6782133c5d151ad4e749cd77d906616c48c06cd7b7bdb84b4c94b89126c67032fe469e56ec342d5e0eecac82cf3b82da6330200d1f329d771
+  metadata.gz: 75fcf22eea9e1f738eeb502fe7bd31f5ae0c8b845857cd5610404f9943f89303fa2d84713174bda7c753f82e893604325de89fa9594292630d0e70180d781d43
+  data.tar.gz: 550773eda18d10aa46e7bdc1f9a3a14b1e483a9aec9268e65b0c530ae1d19f02972facb0252cb7316f2bb689cca7d21fbbf68809909a152bd5e4c9ace43171d1

data/ChangeLog

@@ -1,9 +1,41 @@
+2014-04-14  Mahlon E. Smith  <mahlon@laika.com>
+
+	* Rakefile:
+	Add configurability to the dependencies list.
+	[f73d3ee81d17] [tip]
+
+2014-04-14  Michael Granger  <ged@FaerieMUD.org>
+
+	* .hgtags:
+	Added tag v0.6.0 for changeset a088731f43ff
+	[718f55893ad5]
+
+	* .hgsigs:
+	Added signature for changeset fa6a367872f4
+	[a088731f43ff] [v0.6.0]
+
+	* History.rdoc, lib/symphony.rb:
+	Bump the minor version, update history
+	[fa6a367872f4] [github/master]
+
+	* TODO.md, lib/symphony/queue.rb, spec/symphony/queue_spec.rb:
+	Update the TO-DO list
+	[b30f07c96e7e]
+
+	* lib/symphony/queue.rb:
+	Set cancel-on-failover flag to the queue consumer
+	[7c4d92ddbc79]
+
+	* Rakefile:
+	Remove the ssh-related dev deps
+	[ccfe90203de7]
+
 2014-04-14  Mahlon E. Smith  <mahlon@laika.com>
 
 	* Manifest.txt, Rakefile, lib/symphony/tasks/ssh.rb,
 	lib/symphony/tasks/sshscript.rb:
 	Branch merge from 221b25852ba6.
-	[3673b0e7202d] [tip]
+	[3673b0e7202d]
 
 	* .hoerc, Manifest.txt, spec/symphony/mixins_spec.rb:
 	Complete the intervalexpression backout.
@@ -41,7 +73,7 @@
 
 	* .hgtags:
 	Added tag v0.5.0 for changeset f8e6883990fc
-	[41fc4926342b] [github/master]
+	[41fc4926342b]
 
 	* .hgsigs:
 	Added signature for changeset 369353a62297

data/History.rdoc

@@ -1,3 +1,13 @@
+== v0.7.0 [2014-05-05] Michael Granger <ged@FaerieMUD.org>
+
+Add a 'before_fork' hook to Symphony::Task.
+
+
+== v0.6.1 [2014-04-23] Michael Granger <ged@FaerieMUD.org>
+
+Handle SIGQUIT the same as SIGINT and SIGTERM in the daemon.
+
+
 == v0.6.0 [2014-04-14] Michael Granger <ged@FaerieMUD.org>
 
 - Set cancel-on-failover flag in the queue consumer

data/Rakefile

@@ -27,6 +27,7 @@ hoespec = Hoe.spec 'symphony' do |spec|
 	spec.developer 'Michael Granger', 'ged@FaerieMUD.org'
 	spec.developer 'Mahlon E. Smith', 'mahlon@martini.nu'
 
+	spec.dependency 'configurability', '~> 2.1'
 	spec.dependency 'loggability', '~> 0.10'
 	spec.dependency 'pluggability', '~> 0.4'
 	spec.dependency 'bunny', '~> 1.1'

data/lib/symphony.rb

@@ -12,10 +12,10 @@ module Symphony
 	       Configurability
 
 	# Library version constant
-	VERSION = '0.6.0'
+	VERSION = '0.7.0'
 
 	# Version-control revision constant
-	REVISION = %q$Revision: fa6a367872f4 $
+	REVISION = %q$Revision: 52300e72d138 $
 
 
 	# The name of the environment variable to check for config file overrides

data/lib/symphony/daemon.rb

@@ -113,9 +113,6 @@ class Symphony::Daemon
 
 	### Create a new Daemon instance.
 	def initialize
-		# Process control
-		@tasks               = self.class.tasks
-
 		@running_tasks       = {}
 		@running             = false
 		@shutting_down       = false
@@ -143,6 +140,10 @@ class Symphony::Daemon
 	attr_reader :config
 
 
+	# Make a delegator for the class's task list
+	define_method( :tasks, &self.method(:tasks) )
+
+
 	### Returns +true+ if the daemon is still running.
 	def running?
 		return @running
@@ -236,7 +237,7 @@ class Symphony::Daemon
 	def handle_signal( sig )
 		self.log.debug "Handling signal %s in PID %d" % [ sig, Process.pid ]
 		case sig
-		when :INT, :TERM
+		when :INT, :TERM, :QUIT
 			if @running
 				self.log.warn "%s signal: graceful shutdown" % [ sig ]
 				@running = false
@@ -338,6 +339,7 @@ class Symphony::Daemon
 		return if self.shutting_down?
 
 		self.log.debug "Starting a %p." % [ task_class ]
+		task_class.before_fork
 		pid = Process.fork do
 			task_class.after_fork
 			task_class.run

data/lib/symphony/signal_handling.rb

@@ -108,5 +108,12 @@ module Symphony::SignalHandling
 	end
 
 
+	### Simulate the receipt of the specified +signal+ (probably only useful
+	### in testing).
+	def simulate_signal( signal )
+		Thread.main[:signal_queue] << signal.to_sym
+		self.wake_up
+	end
+
 end # module Symphony::SignalHandling
 

data/lib/symphony/task.rb

@@ -51,6 +51,13 @@ class Symphony::Task
 	end
 
 
+	### Prepare the process to be forked.
+	def self::before_fork
+		self.log.debug "Before fork [%d]: Threads: %p" % [ Process.pid, ThreadGroup::Default.list ]
+		# No-op
+	end
+
+
 	### Prepare the process after being forked from the Daemon.
 	def self::after_fork
 		self.log.debug "After fork [%d]: Threads: %p" % [ Process.pid, ThreadGroup::Default.list ]

data/spec/symphony/daemon_spec.rb

@@ -5,9 +5,80 @@ require_relative '../helpers'
 
 require 'symphony/daemon'
 
+class TestTask < Symphony::Task
+
+	# Don't ever really try to handle messages.
+	def start_handling_messages
+	end
+
+end
+
+
 describe Symphony::Daemon do
 
+	before( :each ) do
+		allow( Process ).to receive( :fork ).and_yield
+		allow( Process ).to receive( :setpgid )
+		Symphony::Daemon.configure( tasks: ['test', 'test'] )
+	end
+
+
+	let( :daemon ) { described_class.new }
+
+
+	it "can report what version it is" do
+		expect(
+			described_class.version_string
+		).to match( /#{described_class} #{Symphony::VERSION}/i )
+	end
+
+	it "can include its build number in its version string" do
+		expect(
+			described_class.version_string( true )
+		).to match( /\(build \p{Xdigit}+\)/i )
+	end
+
+	it "loads a task class for each configured task" do
+		expect( daemon.tasks.size ).to eq( 2 )
+		expect( daemon.tasks ).to include( TestTask )
+	end
+
+	it "forks a child for each task" do
+		expect( Process ).to receive( :fork ).twice.and_yield
+		expect( TestTask ).to receive( :after_fork ).twice
+		expect( TestTask ).to receive( :run ).and_return( 118, 119 ) # pids
+
+		daemon.simulate_signal( :TERM )
+
+		status = double( Process::Status, :success? => true )
+		expect( Process ).to receive( :waitpid2 ).
+			with( -1, Process::WNOHANG|Process::WUNTRACED ).
+			and_return( [118, status], [119, status], nil )
+
+		daemon.run_tasks
+	end
+
+	it "exits gracefully on one SIGINT" do
+		daemon.tasks.clear
+		thr = Thread.new { daemon.run_tasks }
+		sleep 0.1 until daemon.running? || !thr.alive?
+
+		expect {
+			daemon.simulate_signal( :INT )
+			thr.join( 2 )
+		}.to change { daemon.running? }.from( true ).to( false )
+	end
+
+	it "exits gracefully on one SIGQUIT" do
+		daemon.tasks.clear
+		thr = Thread.new { daemon.run_tasks }
+		sleep 0.1 until daemon.running? || !thr.alive?
 
+		expect {
+			daemon.simulate_signal( :QUIT )
+			thr.join( 2 )
+		}.to change { daemon.running? }.from( true ).to( false )
+	end
 
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symphony
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Michael Granger
@@ -31,8 +31,22 @@ cert_chain:
   c7ZKPJcWBv0sm81+FCZXNACn2f9jfF8OQinxVs0O052KbGuEQaaiGIYeuuwQE2q6
   ggcrPfcYeTwWlfZPu2LrBg==
   -----END CERTIFICATE-----
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-05-05 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: configurability
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: loggability
   requirement: !ruby/object:Gem::Requirement

metadata.gz.sig

@@ -1 +1 @@
-��
�rÛ�
�G��\�w!C���4��vo<�*�a˚�����9:�hT�5�W�E�v�Y�suQoMv�D�R�W;��%c��
o�| ���OW\5� �h~��\��͠-n@߹+���!HZ
+=`ܢ
���:b�a-q6P�0rج@��D��&���f�{���ȅ)����q�N�^�ˠ�������X�&�k�F�K��?kI^ܐS���f	�?�������o)��ǒ��f��Y�3�n�����Q�ǘ�����o�g���/�Z�.�D1�qA��y����Џ���*��X������k}��d.� ���\�L�.Y����ԙˑ�J��2T�´\p��/rn��:���v�&h	��l�M���L��/Q