droid 1.0.2pre → 1.0.2

data/lib/droid/monkey.rb

@@ -1,8 +1,8 @@
 module AMQP
-	module Client
-		def reconnect(*args)
-			sleep 10
-			exit 1
-		end
-	end
+  module Client
+    def reconnect(*args)
+      sleep 10
+      exit 1
+    end
+  end
 end

data/lib/droid/publish.rb

@@ -1,31 +1,28 @@
 require 'droid/utils'
 
 class Droid
-	# publish to queue directly
-	def self.publish_to_q(queue_name, data, opts={}, popts={})
-		q = ::MQ.queue(queue_name)
-		json, popts = Droid::Utils.format_publish(data, opts, popts)
-		q.publish(json, popts)
-		log.info "amqp_publish queue=#{queue_name} #{Droid::Utils.format_data_summary(data, popts[:headers])}" unless opts[:log] == false
-	end
+  # publish to queue directly
+  def self.publish_to_q(queue_name, data, opts={}, popts={})
+    json, popts = Droid::Utils.format_publish(data, opts, popts)
+    # specifying passive on the queue does not declare the queue
+    # but will throw an error if the queue does not already exist
+    # this is ok for our purposes since if no one is listening
+    # nothing would really happen anyways.
+    q = ::MQ.queue(queue_name, :passive => true)
+    q.publish(json, popts)
+    log.info "amqp_publish queue=#{queue_name} #{Droid::Utils.format_data_summary(data, popts[:headers])}" unless opts[:log] == false
+  end
 
-	def self.reply_to_q(queue_name, data, opts={}, popts={})
-		q = ::MQ.queue(queue_name, :auto_delete => true)
-		json, popts = Droid::Utils.format_publish(data, opts, popts)
-		q.publish(json, popts)
-		log.info "amqp_reply queue=#{queue_name} #{Droid::Utils.format_data_summary(data, popts[:headers])}" unless opts[:log] == false
-	end
+  # publish to exchange directly
+  def self.publish_to_ex(ex_name, data, opts={}, popts={})
+    ex = ::MQ.direct(ex_name)
+    json, popts = Droid::Utils.format_publish(data, opts, popts)
+    ex.publish(json, popts)
+    log.info "amqp_publish exchange=#{ex_name} #{Droid::Utils.format_data_summary(data, popts[:headers])}" unless opts[:log] == false
+  end
 
-	# publish to exchange directly
-	def self.publish_to_ex(ex_name, data, opts={}, popts={})
-		ex = ::MQ.direct(ex_name)
-		json, popts = Droid::Utils.format_publish(data, opts, popts)
-		ex.publish(json, popts)
-		log.info "amqp_publish exchange=#{ex_name} #{Droid::Utils.format_data_summary(data, popts[:headers])}" unless opts[:log] == false
-	end
-
-	# default is publish to exchange
-	def self.publish(ex_name, data, opts={}, popts={})
-		publish_to_ex(ex_name, data, opts, popts)
-	end
+  # default is publish to exchange
+  def self.publish(ex_name, data, opts={}, popts={})
+    publish_to_ex(ex_name, data, opts, popts)
+  end
 end

data/lib/droid/queue.rb

@@ -1,196 +1,196 @@
 class Droid
-	class ExpiredMessage < RuntimeError; end
-
-	class BaseQueue
-		attr_reader :queue_name, :opts
-		attr_reader :q, :ex, :mq
-
-		def initialize(queue_name, opts={})
-			opts[:auto_delete] = true unless opts.has_key?(:auto_delete) and opts[:auto_delete] === false
-
-			@queue_name, @opts = queue_name, opts
-		end
-
-		def setup
-			@mq = MQ.new
-			@q = @mq.queue(queue_name, opts)
-			# if we don't specify an exchange name it defaults to the queue_name
-			@ex = @mq.direct(opts[:exchange_name] || queue_name)
-		end
-
-		def temp?
-			false
-		end
-
-		def log
-			Droid.log
-		end
-
-		def tag
-			s = "queue=#{q.name}"
-			s += " exchange=#{ex.name}" if ex
-		end
-
-		def subscribe(amqp_opts={}, opts={})
-			setup
-
-			q.bind(ex) if ex
-			q.subscribe(amqp_opts) do |header, message|
-				Droid::Utilization.monitor(q.name, :temp => temp?) do
-					request = Droid::Request.new(self, header, message)
-					log.info "amqp_message #{tag} action=received ttl=#{request.ttl} age=#{request.age} #{request.data_summary}"
-					begin
-						raise Droid::ExpiredMessage if request.expired?
-						yield request if block_given?
-						finished = Time.now.getgm.to_i
-						log.info "amqp_message action=processed #{tag} elapsed=#{finished-request.start} ttl=#{request.ttl} age=#{request.age} #{request.data_summary}"
-					rescue Droid::ExpiredMessage
-						log.info "amqp_message action=timeout #{tag} ttl=#{request.ttl} age=#{request.age} #{request.data_summary}"
-						request.ack if amqp_opts[:ack]
-					rescue => e
-						request.ack if amqp_opts[:ack]
-						Droid.handle_error(e)
-					end
-				end
-			end
-			log.info "amqp_subscribe #{tag}"
-			self
-		end
-
-		def teardown
-			@q.unsubscribe
-			@mq.close
-			log.info "amqp_unsubscribe #{tag}"
-		end
-
-		def destroy
-			teardown
-		end
-	end
-
-	class WorkerQueue < BaseQueue
-		attr_reader :prefetch
-
-		def initialize(queue_name, opts={})
-			@prefetch = opts.delete(:prefetch) || 1
-			opts[:auto_delete] = false
-
-			super(queue_name, opts)
-		end
-
-		def setup
-			super
-			@mq.prefetch(self.prefetch)
-		end
-
-		def subscribe(amqp_opts={}, opts={})
-			amqp_opts[:ack] = true
-			super(amqp_opts, opts) do |request|
-				begin
-					yield request if block_given?
-				ensure
-					request.ack unless amqp_opts[:auto_ack] == false
-				end
-			end
-		end
-	end
-
-	class ListenQueue < BaseQueue
-		def initialize(exchange_name, opts={})
-			opts[:exchange_name] = exchange_name
-			queue_name = opts.delete(:queue) || Droid::Utils.generate_queue(exchange_name)
-			super(queue_name, opts)
-		end
-	end
-
-	class ReplyQueue < BaseQueue
-		def initialize(queue_name, opts={})
-			opts[:auto_delete] = true
-			super
-		end
-
-		def setup
-			@mq = MQ.new
-			@q = @mq.queue(queue_name, opts)
-			@ex = nil
-		end
-
-		def temp?
-			true
-		end
-
-		def subscribe(amqp_opts={}, opts={})
-			super(amqp_opts, opts) do |request|
-				yield request if block_given?
-				self.destroy
-			end
-		end
-
-		def teardown
-			@q.delete
-			super
-		end
-	end
-
-	module QueueMethods
-		def worker(queue_name, opts={})
-			WorkerQueue.new(queue_name, opts)
-		end
-
-		def listener(exchange_name, opts={})
-			ListenQueue.new(exchange_name, opts)
-		end
-	end
-
-	class BackwardsCompatibleQueue < BaseQueue
-		def initialize(exchange_name, opts={})
-			opts[:auto_delete] = true unless opts.has_key?(:auto_delete) and opts[:auto_delete] === false
-			opts[:exchange_name] = exchange_name
-			queue_name = opts.delete(:queue) || Droid::Utils.generate_queue(exchange_name)
-			@queue_name, @opts = queue_name, opts
-		end
-
-		def setup
-			@mq = MQ.new
-			@q = @mq.queue(queue_name, opts)
-			@ex = @mq.direct(opts[:exchange_name])
-
-			@mq.prefetch(opts[:prefetch]) if opts[:prefetch]
-		end
-
-		def subscribe(amqp_opts={}, opts={})
-			super(amqp_opts, opts) do |request|
-				if block_given?
-					if opts[:detail]
-						yield request, request.header, request.raw_message if block_given?
-					else
-						yield request if block_given?
-					end
-				end
-			end
-
-			self
-		end
-	end
-
-	module BackwardsCompatibleMethods
-		def listen4(key, orig_opts={}, &block)
-			opts = {}
-			amqp_opts = {}
-			subscribe_opts = {}
-
-			if orig_opts[:prefetch] || orig_opts[:ack]
-				opts[:prefetch] = orig_opts[:prefetch] || 1
-				opts[:ack] = true
-			end
-			if orig_opts[:queue]
-				opts[:queue] = orig_opts[:queue]
-			end
-			if orig_opts[:detail]
-				subscribe_opts[:detail] = true
-			end
-
-			BackwardsCompatibleQueue.new(key, opts).subscribe(amqp_opts, subscribe_opts, &block)
-		end
-	end
+  class ExpiredMessage < RuntimeError; end
+
+  class BaseQueue
+    attr_reader :queue_name, :opts
+    attr_reader :q, :ex, :mq
+
+    def initialize(queue_name, opts={})
+      opts[:auto_delete] = true unless opts.has_key?(:auto_delete) and opts[:auto_delete] === false
+
+      @queue_name, @opts = queue_name, opts
+    end
+
+    def setup
+      @mq = MQ.new
+      @q = @mq.queue(queue_name, opts)
+      # if we don't specify an exchange name it defaults to the queue_name
+      @ex = @mq.direct(opts[:exchange_name] || queue_name)
+    end
+
+    def temp?
+      false
+    end
+
+    def log
+      Droid.log
+    end
+
+    def tag
+      s = "queue=#{q.name}"
+      s += " exchange=#{ex.name}" if ex
+    end
+
+    def subscribe(amqp_opts={}, opts={})
+      setup
+
+      q.bind(ex) if ex
+      q.subscribe(amqp_opts) do |header, message|
+        Droid::Utilization.monitor(q.name, :temp => temp?) do
+          request = Droid::Request.new(self, header, message)
+          log.info "amqp_message #{tag} action=received ttl=#{request.ttl} age=#{request.age} #{request.data_summary}"
+          begin
+            raise Droid::ExpiredMessage if request.expired?
+            yield request if block_given?
+            finished = Time.now.getgm.to_i
+            log.info "amqp_message action=processed #{tag} elapsed=#{finished-request.start} ttl=#{request.ttl} age=#{request.age} #{request.data_summary}"
+          rescue Droid::ExpiredMessage
+            log.info "amqp_message action=timeout #{tag} ttl=#{request.ttl} age=#{request.age} #{request.data_summary}"
+            request.ack if amqp_opts[:ack]
+          rescue => e
+            request.ack if amqp_opts[:ack]
+            Droid.handle_error(e)
+          end
+        end
+      end
+      log.info "amqp_subscribe #{tag}"
+      self
+    end
+
+    def teardown
+      @q.unsubscribe
+      @mq.close
+      log.info "amqp_unsubscribe #{tag}"
+    end
+
+    def destroy
+      teardown
+    end
+  end
+
+  class WorkerQueue < BaseQueue
+    attr_reader :prefetch
+
+    def initialize(queue_name, opts={})
+      @prefetch = opts.delete(:prefetch) || 1
+      opts[:auto_delete] = false
+
+      super(queue_name, opts)
+    end
+
+    def setup
+      super
+      @mq.prefetch(self.prefetch)
+    end
+
+    def subscribe(amqp_opts={}, opts={})
+      amqp_opts[:ack] = true
+      super(amqp_opts, opts) do |request|
+        begin
+          yield request if block_given?
+        ensure
+          request.ack unless amqp_opts[:auto_ack] == false
+        end
+      end
+    end
+  end
+
+  class ListenQueue < BaseQueue
+    def initialize(exchange_name, opts={})
+      opts[:exchange_name] = exchange_name
+      queue_name = opts.delete(:queue) || Droid::Utils.generate_queue(exchange_name)
+      super(queue_name, opts)
+    end
+  end
+
+  class ReplyQueue < BaseQueue
+    def initialize(queue_name, opts={})
+      opts[:auto_delete] = true
+      super
+    end
+
+    def setup
+      @mq = MQ.new
+      @q = @mq.queue(queue_name, opts)
+      @ex = nil
+    end
+
+    def temp?
+      true
+    end
+
+    def subscribe(amqp_opts={}, opts={})
+      super(amqp_opts, opts) do |request|
+        yield request if block_given?
+        self.destroy
+      end
+    end
+
+    def teardown
+      @q.delete
+      super
+    end
+  end
+
+  module QueueMethods
+    def worker(queue_name, opts={})
+      WorkerQueue.new(queue_name, opts)
+    end
+
+    def listener(exchange_name, opts={})
+      ListenQueue.new(exchange_name, opts)
+    end
+  end
+
+  class BackwardsCompatibleQueue < BaseQueue
+    def initialize(exchange_name, opts={})
+      opts[:auto_delete] = true unless opts.has_key?(:auto_delete) and opts[:auto_delete] === false
+      opts[:exchange_name] = exchange_name
+      queue_name = opts.delete(:queue) || Droid::Utils.generate_queue(exchange_name)
+      @queue_name, @opts = queue_name, opts
+    end
+
+    def setup
+      @mq = MQ.new
+      @q = @mq.queue(queue_name, opts)
+      @ex = @mq.direct(opts[:exchange_name])
+
+      @mq.prefetch(opts[:prefetch]) if opts[:prefetch]
+    end
+
+    def subscribe(amqp_opts={}, opts={})
+      super(amqp_opts, opts) do |request|
+        if block_given?
+          if opts[:detail]
+            yield request, request.header, request.raw_message if block_given?
+          else
+            yield request if block_given?
+          end
+        end
+      end
+
+      self
+    end
+  end
+
+  module BackwardsCompatibleMethods
+    def listen4(key, orig_opts={}, &block)
+      opts = {}
+      amqp_opts = {}
+      subscribe_opts = {}
+
+      if orig_opts[:prefetch] || orig_opts[:ack]
+        opts[:prefetch] = orig_opts[:prefetch] || 1
+        opts[:ack] = true
+      end
+      if orig_opts[:queue]
+        opts[:queue] = orig_opts[:queue]
+      end
+      if orig_opts[:detail]
+        subscribe_opts[:detail] = true
+      end
+
+      BackwardsCompatibleQueue.new(key, opts).subscribe(amqp_opts, subscribe_opts, &block)
+    end
+  end
 end