symphony 0.12.3 → 0.14.0

data/lib/symphony/statistics.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'loggability'
 require 'symphony' unless defined?( Symphony )

data/lib/symphony/task.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'set'
 require 'sysexits'
@@ -7,7 +7,7 @@ require 'pluggability'
 require 'loggability'
 
 require 'msgpack'
-require 'yajl'
+require 'json'
 require 'yaml'
 
 require 'symphony' unless defined?( Symphony )
@@ -47,6 +47,15 @@ class Symphony::Task
 	plugin_prefixes 'symphony/tasks'
 
 
+	@queue         = nil
+	@acknowledge   = true
+	@routing_keys  = Set.new
+	@prefetch      = 10
+	@persistent    = false
+	@always_rebind = false
+	@queue_type    = nil
+
+
 	### Create a new Task object and listen for work. Exits with the code returned
 	### by #start when it's done.
 	def self::run( exit_on_idle=false )
@@ -79,11 +88,15 @@ class Symphony::Task
 	def self::inherited( subclass )
 		super
 
+		subclass.instance_variable_set( :@queue, nil )
+		subclass.instance_variable_set( :@queue_type, nil )
+		subclass.instance_variable_set( :@always_rebind, false )
 		subclass.instance_variable_set( :@routing_keys, Set.new )
 		subclass.instance_variable_set( :@acknowledge, true )
 		subclass.instance_variable_set( :@work_model, :longlived )
 		subclass.instance_variable_set( :@prefetch, 10 )
 		subclass.instance_variable_set( :@timeout_action, :reject )
+		subclass.instance_variable_set( :@timeout, nil )
 		subclass.instance_variable_set( :@persistent, false )
 		subclass.instance_variable_set( :@idle_timeout, DEFAULT_IDLE_TIMEOUT )
 	end
@@ -132,6 +145,16 @@ class Symphony::Task
 	end
 
 
+	### Specify an x-queue-type for the underlying queue
+	def self::queue_type( type=nil )
+		if type
+			@queue_type = type
+		end
+
+		return @queue_type
+	end
+
+
 	### Set up one or more topic key patterns to use when binding the Task's queue
 	### to the exchange.
 	def self::subscribe_to( *routing_keys )
@@ -438,7 +461,7 @@ class Symphony::Task
 			when 'application/x-msgpack'
 				MessagePack.unpack( payload )
 			when 'application/json', 'text/javascript'
-				Yajl::Parser.parse( payload )
+				JSON.parse( payload )
 			when 'application/x-yaml', 'text/x-yaml'
 				YAML.load( payload )
 			else

data/lib/symphony/task_group.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'set'
 require 'pluggability'

data/lib/symphony/task_group/longlived.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'set'
 require 'symphony/task_group' unless defined?( Symphony::TaskGroup )
@@ -35,8 +35,9 @@ class Symphony::TaskGroup::LongLived < Symphony::TaskGroup
 			return [ pid ]
 		end
 
-		@queue ||= self.get_message_counting_queue
-
+		return nil
+	rescue Timeout::Error => err
+		self.log.warn "%p while adjusting workers: %s" % [ err.class, err.message ]
 		return nil
 	end
 
@@ -44,11 +45,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 +62,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 +83,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
 		self.log.info "Child hasn't created the queue yet; deferring"
 		Symphony::Queue.reset
 

data/lib/symphony/task_group/oneshot.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 
 require 'symphony/task_group' unless defined?( Symphony::TaskGroup )
 

data/spec/helpers.rb

@@ -48,6 +48,10 @@ module Symphony::SpecHelpers
 			def initialize
 				@queue = nil
 				@exchange = nil
+				@open = true
+			end
+			def open?
+				return @open
 			end
 			def queue( name, opts={} )
 				return @queue ||= DummySession::Queue.new( self )
@@ -60,7 +64,9 @@ module Symphony::SpecHelpers
 			def number
 				return 1
 			end
-			def close; end
+			def close
+				@open = false
+			end
 		end
 
 		class Exchange
@@ -86,14 +92,24 @@ end
 
 ### Mock with RSpec
 RSpec.configure do |config|
-	config.run_all_when_everything_filtered = true
-	config.filter_run :focus
-	config.order = 'random'
-	config.expect_with( :rspec )
-	config.mock_with( :rspec ) do |mock|
-		mock.syntax = :expect
+	config.expect_with :rspec do |expectations|
+		expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+		expectations.syntax = :expect
+	end
+
+	config.mock_with :rspec do |mocks|
+		mocks.verify_partial_doubles = true
 	end
 
+	config.run_all_when_everything_filtered = true
+	config.filter_run_when_matching :focus
+	config.order = :random
+	config.example_status_persistence_file_path = 'spec/.state'
+	config.disable_monkey_patching!
+	config.warnings = true
+	config.profile_examples = 5
+
+
 	config.include( Loggability::SpecHelpers )
 	config.include( Symphony::SpecHelpers )
 end

data/spec/symphony/daemon_spec.rb

@@ -1,5 +1,5 @@
 # -*- ruby -*-
-#encoding: utf-8
+# frozen_string_literal: true
 # vim: set noet nosta sw=4 ts=4 :
 
 
@@ -19,7 +19,7 @@ class Test3Task < Symphony::Task
 end
 
 
-describe Symphony::Daemon do
+RSpec.describe Symphony::Daemon do
 
 	before( :all ) do
 		@pids = ( 200..65534 ).cycle

data/spec/symphony/mixins_spec.rb

@@ -5,12 +5,16 @@ require_relative '../helpers'
 require 'symphony/mixins'
 
 
-describe Symphony, 'mixins' do
+RSpec.describe Symphony, 'mixins' do
 
 	describe Symphony::MethodUtilities, 'used to extend a class' do
 
 		let!( :extended_class ) do
-			klass = Class.new
+			klass = Class.new do
+				def initialize
+					@foo = nil
+				end
+			end
 			klass.extend( Symphony::MethodUtilities )
 			klass
 		end

data/spec/symphony/queue_spec.rb

@@ -4,7 +4,7 @@ require_relative '../helpers'
 
 require 'symphony/queue'
 
-describe Symphony::Queue do
+RSpec.describe Symphony::Queue do
 
 
 	before( :each ) do
@@ -128,7 +128,33 @@ describe Symphony::Queue do
 			expect( new_channel ).to receive( :prefetch ).
 				with( Symphony::Queue::DEFAULT_PREFETCH )
 			expect( new_channel ).to receive( :queue ).
-				with( queue.name, auto_delete: true ).
+				with( queue.name, auto_delete: true, arguments: {} ).
+				and_return( amqp_queue )
+			expect( amqp_queue ).to receive( :bind ).
+				with( described_class.amqp_exchange, routing_key: 'floppy.rabbit.#' )
+
+			expect( queue.create_amqp_queue ).to be( amqp_queue )
+		end
+
+
+		it "can declare the queue's x-queue-type" do
+			testing_task_class.subscribe_to( 'floppy.rabbit.#' )
+			testing_task_class.queue_type( 'classic' )
+			expect( described_class.amqp_channel ).to receive( :queue ).
+				with( queue.name, passive: true ).
+				and_raise( Bunny::NotFound.new("no such queue", described_class.amqp_channel, true) )
+			expect( described_class.amqp_channel ).to receive( :open? ).
+				and_return( false )
+
+			# Channel is reset after queue creation fails
+			new_channel = double( "New AMQP channel" )
+			amqp_queue = double( "AMQP queue" )
+			allow( described_class.amqp_session ).to receive( :create_channel ).
+				and_return( new_channel )
+			expect( new_channel ).to receive( :prefetch ).
+				with( Symphony::Queue::DEFAULT_PREFETCH )
+			expect( new_channel ).to receive( :queue ).
+				with( queue.name, auto_delete: true, arguments: { 'x-queue-type' => 'classic' } ).
 				and_return( amqp_queue )
 			expect( amqp_queue ).to receive( :bind ).
 				with( described_class.amqp_exchange, routing_key: 'floppy.rabbit.#' )

data/spec/symphony/routing_spec.rb

@@ -7,7 +7,7 @@ require 'symphony'
 require 'symphony/routing'
 
 
-describe Symphony::Routing do
+RSpec.describe Symphony::Routing do
 
 	let( :task_class ) do
 		Class.new( Symphony::Task ) do

data/spec/symphony/statistics_spec.rb

@@ -5,7 +5,7 @@ require_relative '../helpers'
 require 'symphony/statistics'
 
 
-describe Symphony::Statistics do
+RSpec.describe Symphony::Statistics do
 
 
 	let( :including_class ) do

data/spec/symphony/task_group/longlived_spec.rb

@@ -4,7 +4,7 @@ require_relative '../../helpers'
 
 require 'symphony/task_group/longlived'
 
-describe Symphony::TaskGroup::LongLived do
+RSpec.describe Symphony::TaskGroup::LongLived do
 
 	FIRST_PID = 414
 
@@ -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

data/spec/symphony/task_group/oneshot_spec.rb

@@ -5,7 +5,7 @@ require_relative '../../helpers'
 require 'symphony/task_group/oneshot'
 
 
-describe Symphony::TaskGroup::Oneshot do
+RSpec.describe Symphony::TaskGroup::Oneshot do
 
 	let( :task ) do
 		Class.new( Symphony::Task ) do

data/spec/symphony/task_group_spec.rb

@@ -2,7 +2,7 @@
 
 require_relative '../helpers'
 
-describe Symphony::TaskGroup do
+RSpec.describe Symphony::TaskGroup do
 
 	let( :task ) do
 		Class.new( Symphony::Task ) do