symphony 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0e183ac257c66fe624499aa023a5d718f8fc14478c7630a589014b90bda42e52
-  data.tar.gz: 1e4a16de67ffe59e26fa27ad82c8ab01732b0ac8d616ce463c36805357d90a45
+  metadata.gz: 530b4399dc67b699e1f8e53155faa141f7602f3bda7c27bae2682f8bb082e528
+  data.tar.gz: af53f8b1cfe8e82aaabea43a3897c8df3856770cee858b8671e4b512452d451d
 SHA512:
-  metadata.gz: 24620df94d92b8ecc79f96f80d27c5c06390e3d91b7f2d53b484f318c73676ddcfcd35bb166abbc5e9c898368c9a276b50872b4bc396b3d1e5466318eb558a8e
-  data.tar.gz: e938e3c38f6af33f14903a957b14b9380e63b22ddb1f50fe319ad454eae1810fbc5a832ba4ba9c2476a1b69ebd16106451058e433958e311f65c9f0e98399414
+  metadata.gz: 1520a576d3a7f618d8a7a0f2717012a44fa091a44344316d0d7cc77694de6ff08c59cd6c05feac730fb6b60a6bb3b5abca2229a24cd1e71c07d8c6f89a45af00
+  data.tar.gz: e1143395288a3e770b2afb1ddb30ee11899c79306603d99a2393f4119e1c90aef346f27d53971d0360a16e8678a8df9202108a38b69f7d9f1449900311954e59

data/ChangeLog

@@ -1,8 +1,28 @@
+2019-07-01  Michael Granger  <ged@FaerieMUD.org>
+
+@  	* spec/symphony/task_group/longlived_spec.rb:
+|  	Add a spec for closed-channel recovery
+|  	[38701b4ddb53] [tip]
+|
+2019-06-28  Mahlon E. Smith  <mahlon@martini.nu>
+
+o  	* lib/symphony/task_group/longlived.rb:
+|  	Longlived workers: recover from a closed channel.
+|  	[c2e7fccca675]
+|
 2019-06-26  Michael Granger  <ged@FaerieMUD.org>
 
-@  	* History.rdoc, lib/symphony.rb:
+o  	* .hgtags:
+|  	Added tag v0.12.0 for changeset dab8bd9f4b44
+|  	[f29b8df45b29]
+|
+o  	* .hgsigs:
+|  	Added signature for changeset 0b40141657be
+|  	[dab8bd9f4b44] [v0.12.0]
+|
+o  	* History.rdoc, lib/symphony.rb:
 |  	Bump the minor version, update history.
-|  	[0b40141657be] [tip]
+|  	[0b40141657be]
 |
 o  	* lib/symphony/metrics.rb, lib/symphony/task.rb,
 |  	spec/symphony/task_spec.rb:

data/History.rdoc

@@ -1,3 +1,11 @@
+== v0.12.1 [2019-07-01] Michael Granger <ged@FaerieMUD.org>
+
+Bugfixes:
+
+- Longlived workers: recover from a closed channel error on
+  the job-counting queue.
+
+
 == v0.12.0 [2019-06-26] Michael Granger <ged@FaerieMUD.org>
 
 Enhancements:

data/lib/symphony.rb

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

data/lib/symphony/task_group/longlived.rb

@@ -66,6 +66,10 @@ class Symphony::TaskGroup::LongLived < Symphony::TaskGroup
 
 		count = @queue.message_count
 		self.add_sample( count )
+
+	rescue Bunny::ChannelAlreadyClosed => err
+		self.log.debug "Unexpected queue state, resetting: "% [ err.message ]
+		@queue = nil
 	end
 
 

data/spec/symphony/task_group/longlived_spec.rb

@@ -217,6 +217,45 @@ describe Symphony::TaskGroup::LongLived do
 			expect( task_group.workers.size ).to eq( 1 )
 		end
 
+
+		it "reconnects if the message-count channel goes away" do
+			samples = [ 4, 3, 3 ]
+			task_group.sample_size = samples.size
+
+			allow( Process ).to receive( :setpgid )
+
+			channel1 = double( Bunny::Channel )
+			channel2 = double( Bunny::Channel )
+			queue1 = double( Bunny::Queue )
+			queue2 = double( Bunny::Queue )
+
+			expect( Symphony::Queue ).to receive( :amqp_channel ).
+				twice.
+				and_return( channel1, channel2 )
+
+			expect( channel1 ).to receive( :queue ).
+				with( task.queue_name, passive: true, prefetch: 0 ).
+				and_return( queue1 )
+			expect( queue1 ).to_not receive( :consumer_count )
+			expect( queue1 ).to receive( :message_count ).
+				and_raise( Bunny::ChannelAlreadyClosed.new("cannot use a closed channel!", channel1) )
+
+			expect( channel2 ).to receive( :queue ).
+				with( task.queue_name, passive: true, prefetch: 0 ).
+				and_return( queue2 )
+			expect( queue2 ).to receive( :consumer_count ) do
+				task_group.workers.size
+			end.at_least( :once )
+			expect( queue2 ).to receive( :message_count ).and_return( *samples )
+
+			start = 1414002605
+			start.upto( start + samples.size + 2 ) do |time|
+				Timecop.freeze( time ) do
+					task_group.adjust_workers
+				end
+			end
+		end
+
 	end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: symphony
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Michael Granger
@@ -35,7 +35,7 @@ cert_chain:
   v4qqqa27Bs468d6SoPxjSm8a2mM9HZ4OdWhq4tFsbTeXDVquCfi64OTEaTt2xQdR
   JnC4lpJfCP6aCXa5h2XAQfPSH636cQap
   -----END CERTIFICATE-----
-date: 2019-06-26 00:00:00.000000000 Z
+date: 2019-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: configurability
@@ -273,14 +273,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '3.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.18'
+        version: '3.17'
 description: |-
   Symphony is a subscription-based asynchronous job system. It
   allows you to define jobs that watch for lightweight events from a