symphony 0.12.3 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7222c714bd9a2268e47fa14996f96a92e6bc4e443c9212b61aa9a00b64a5dff9
-  data.tar.gz: a63326ee75b5dd8673f17757cb62e2608598623279a2616cd110db7fd97e3ee7
+  metadata.gz: 2ebf037000f9b9878dd653de8fef3bee18a87848355aacf48fecc7dba7a97fec
+  data.tar.gz: 139ee8cc122fe1bd388722a7a432df916b403109aabc404d9998cdaaa4dbc7d7
 SHA512:
-  metadata.gz: afc8ddd33eb3b437ca831426075a9f97927882baa372b356ad5da7e0f97f3c5a80422eae0f86224a87bde87ea2f14d24ce8a3dae5ee8e44b5896ce6889c9a5d6
-  data.tar.gz: 826de2c46e1b1511631dd036e897033b9633a9a2500ac59d95dbe3c884afaade0a10b45b56640f18de2b344d4e688ab259563cb433a2f9d1efe221911e34f5e9
+  metadata.gz: b50d7c1491c8e152b457fb8bf200d1e886efba69a464e94fbde0555ab50a3dad7d0af6beb6c85671873538d650b5bc98b4ff8831f3de7505ffc6c62e8b323390
+  data.tar.gz: 1a6499dd59780c510f4f8e5b61f88e45de471c5453e4fd5d91857d2bb9e813a5d0b557b5a47b86579aec1766013d650a9e4da607f7c78e8ea3768ce3ec5381ac

data/ChangeLog

@@ -2,24 +2,38 @@
 
 o  	* lib/symphony/daemon.rb:
 |  	Observe with one description arg
-|  	[fb1cb7e85622] [tip]
+|  	[d9b6c47d9a4e] [tip]
 |
 2019-07-10  Michael Granger  <ged@FaerieMUD.org>
 
 o  	* lib/symphony/task.rb:
 |  	Rearrange and observe salient methods
-|  	[9a00239b9bcd]
+|  	[732ca4f87efb]
 |
 2019-07-05  Michael Granger  <ged@FaerieMUD.org>
 
 o  	* .gems, Rakefile, lib/symphony.rb, lib/symphony/daemon.rb,
 |  	lib/symphony/task.rb, lib/symphony/task_group.rb:
 |  	Add speculative use of Observability
-|  	[4c0da09bdae2]
+|  	[e57c975ac790]
+|
+2019-07-11  Michael Granger  <ged@FaerieMUD.org>
+
+@  	* .hgtags:
+|  	Added tag v0.12.3 for changeset c785fccd2943
+|  	[6c2e3d5d7eb1]
+|
+o  	* .hgsigs:
+|  	Added signature for changeset 36e4b5500351
+|  	[c785fccd2943] [v0.12.3]
+|
+o  	* History.rdoc, lib/symphony.rb, symphony.gemspec:
+|  	Bump the patch version, update history.
+|  	[36e4b5500351]
 |
 2019-07-10  Michael Granger  <ged@FaerieMUD.org>
 
-@  	* lib/symphony/task.rb, lib/symphony/task_group/longlived.rb,
+o  	* lib/symphony/task.rb, lib/symphony/task_group/longlived.rb,
 |  	spec/symphony/task_group/longlived_spec.rb:
 |  	Re-establish AMQP connections after the task fork
 |  	[70a6afb0622a]

data/History.rdoc

@@ -1,3 +1,11 @@
+== v0.12.4 [2019-07-11] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Be more paranoid about shared channels, and be defensive when using
+  the counting queue.
+
+
 == v0.12.3 [2019-07-11] Michael Granger <ged@FaerieMUD.org>
 
 Bugfixes:

data/lib/symphony/queue.rb

@@ -69,6 +69,7 @@ class Symphony::Queue
 
 	### Fetch a Hash of AMQP options.
 	def self::amqp_session_options
+		self.session_opts ||= self.defaults
 		opts = self.session_opts.merge({
 			logger: Loggability[ Bunny ],
 		})

data/lib/symphony/task_group/longlived.rb

@@ -35,8 +35,6 @@ class Symphony::TaskGroup::LongLived < Symphony::TaskGroup
 			return [ pid ]
 		end
 
-		@queue ||= self.get_message_counting_queue
-
 		return nil
 	end
 
@@ -44,11 +42,10 @@ class Symphony::TaskGroup::LongLived < Symphony::TaskGroup
 	### Return +true+ if the task group should scale up by one.
 	def needs_a_worker?
 		return true if self.workers.empty?
-		return false unless @queue
-
+		queue = self.get_message_counting_queue or return false
 
 		# Calculate the number of workers across the whole broker
-		if ( cc = @queue.consumer_count ) >= self.max_workers
+		if ( cc = queue.consumer_count ) >= self.max_workers
 			self.log.debug "%p: Already at max workers (%d)" % [ self.task_class, self.max_workers ]
 			return false
 		else
@@ -62,9 +59,10 @@ class Symphony::TaskGroup::LongLived < Symphony::TaskGroup
 
 	### Add the current number of workers to the samples.
 	def sample_queue_status
-		return unless @queue
+		return if self.workers.empty?
 
-		count = @queue.message_count
+		queue = self.get_message_counting_queue or return
+		count = queue.message_count
 		self.add_sample( count )
 	end
 
@@ -82,11 +80,20 @@ class Symphony::TaskGroup::LongLived < Symphony::TaskGroup
 	### Get a queue for counting the number of messages in the queue for this
 	### worker.
 	def get_message_counting_queue
-		channel = Symphony::Queue.amqp_channel
-		queue = channel.queue( self.task_class.queue_name, passive: true, prefetch: 0 )
+		@queue ||= begin
+			self.log.debug "Creating the message-counting queue."
+			channel = Symphony::Queue.amqp_channel
+			channel.queue( self.task_class.queue_name, passive: true, prefetch: 0 )
+		end
+
+		unless @queue.channel.open?
+			self.log.info "Message-counting queue's channel was closed: resetting."
+			Symphony::Queue.reset
+			@queue = nil
+		end
 
-		return queue
-	rescue Bunny::NotFound => err
+		return @queue
+	rescue Bunny::NotFound, Bunny::ChannelAlreadyClosed => err
 		self.log.info "Child hasn't created the queue yet; deferring"
 		Symphony::Queue.reset
 

data/lib/symphony.rb

@@ -12,7 +12,7 @@ module Symphony
 	       Configurability
 
 	# Library version constant
-	VERSION = '0.12.3'
+	VERSION = '0.12.4'
 
 	# Version-control revision constant
 	REVISION = %q$Revision$

data/spec/symphony/task_group/longlived_spec.rb

@@ -23,6 +23,9 @@ describe Symphony::TaskGroup::LongLived do
 			def self::run
 				self.has_run = true
 			end
+			def self::name
+				return "TestTask"
+			end
 		end
 	end
 
@@ -75,8 +78,8 @@ describe Symphony::TaskGroup::LongLived do
 
 			allow( Process ).to receive( :setpgid )
 
-			channel = double( Bunny::Channel )
-			queue = double( Bunny::Queue )
+			channel = double( Bunny::Channel, open?: true )
+			queue = double( Bunny::Queue, channel: channel )
 			expect( Symphony::Queue ).to receive( :amqp_channel ).
 				and_return( channel )
 			expect( channel ).to receive( :queue ).
@@ -89,7 +92,8 @@ describe Symphony::TaskGroup::LongLived do
 			expect( queue ).to receive( :message_count ).and_return( *samples )
 
 			start = 1414002605
-			start.upto( start + samples.size + 1 ) do |time|
+			start.upto( start + samples.size ) do |time|
+				Loggability.logger.debug "Foom"
 				Timecop.freeze( time ) do
 					task_group.adjust_workers
 				end
@@ -106,8 +110,8 @@ describe Symphony::TaskGroup::LongLived do
 
 			allow( Process ).to receive( :setpgid )
 
-			channel = double( Bunny::Channel )
-			queue = double( Bunny::Queue )
+			channel = double( Bunny::Channel, open?: true )
+			queue = double( Bunny::Queue, channel: channel )
 			expect( Symphony::Queue ).to receive( :amqp_channel ).
 				and_return( channel )
 			expect( channel ).to receive( :queue ).
@@ -120,7 +124,7 @@ describe Symphony::TaskGroup::LongLived do
 			expect( queue ).to receive( :message_count ).and_return( *samples )
 
 			start = 1414002605
-			start.upto( start + samples.size + 1 ) do |time|
+			start.upto( start + samples.size ) do |time|
 				Timecop.freeze( time ) do
 					task_group.adjust_workers
 				end
@@ -136,8 +140,8 @@ describe Symphony::TaskGroup::LongLived do
 
 			allow( Process ).to receive( :setpgid )
 
-			channel = double( Bunny::Channel )
-			queue = double( Bunny::Queue )
+			channel = double( Bunny::Channel, open?: true )
+			queue = double( Bunny::Queue, channel: channel )
 			expect( Symphony::Queue ).to receive( :amqp_channel ).
 				and_return( channel )
 			expect( channel ).to receive( :queue ).
@@ -150,7 +154,7 @@ describe Symphony::TaskGroup::LongLived do
 			expect( queue ).to receive( :message_count ).and_return( *samples )
 
 			start = 1414002605
-			start.upto( start + samples.size + 1 ) do |time|
+			start.upto( start + samples.size ) do |time|
 				Timecop.freeze( time ) do
 					task_group.adjust_workers
 				end
@@ -166,8 +170,8 @@ describe Symphony::TaskGroup::LongLived do
 
 			allow( Process ).to receive( :setpgid )
 
-			channel = double( Bunny::Channel )
-			queue = double( Bunny::Queue )
+			channel = double( Bunny::Channel, open?: true )
+			queue = double( Bunny::Queue, channel: channel )
 			expect( Symphony::Queue ).to receive( :amqp_channel ).
 				and_return( channel )
 			expect( channel ).to receive( :queue ).
@@ -178,7 +182,7 @@ describe Symphony::TaskGroup::LongLived do
 			expect( queue ).to receive( :message_count ).and_return( *samples )
 
 			start = 1414002605
-			start.upto( start + samples.size + 1 ) do |time|
+			start.upto( start + samples.size ) do |time|
 				Timecop.freeze( time ) do
 					task_group.adjust_workers
 				end
@@ -194,8 +198,8 @@ describe Symphony::TaskGroup::LongLived do
 
 			allow( Process ).to receive( :setpgid )
 
-			channel = double( Bunny::Channel )
-			queue = double( Bunny::Queue )
+			channel = double( Bunny::Channel, open?: true )
+			queue = double( Bunny::Queue, channel: channel )
 			expect( Symphony::Queue ).to receive( :amqp_channel ).
 				and_return( channel )
 			expect( channel ).to receive( :queue ).
@@ -208,7 +212,7 @@ describe Symphony::TaskGroup::LongLived do
 			expect( queue ).to receive( :message_count ).and_return( *samples )
 
 			start = 1414002605
-			start.upto( start + samples.size + 1 ) do |time|
+			start.upto( start + samples.size ) do |time|
 				Timecop.freeze( time ) do
 					task_group.adjust_workers
 				end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symphony
 version: !ruby/object:Gem::Version
-  version: 0.12.3
+  version: 0.12.4
 platform: ruby
 authors:
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   v4qqqa27Bs468d6SoPxjSm8a2mM9HZ4OdWhq4tFsbTeXDVquCfi64OTEaTt2xQdR
   JnC4lpJfCP6aCXa5h2XAQfPSH636cQap
   -----END CERTIFICATE-----
-date: 2019-07-11 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability