rabbit_jobs 0.4.14 → 0.5.0

data/lib/rabbit_jobs.rb

@@ -24,7 +24,6 @@ module RabbitJobs
     raise if EM.reactor_running?
 
     EM.run {
-      AmqpHelper.prepare_connection
       yield
     }
   end

data/lib/rabbit_jobs/amqp_helper.rb

@@ -13,62 +13,61 @@ module RabbitJobs
 
     class << self
 
-      def prepare_connection
-        if !AMQP.connection || AMQP.connection.closed?
+      def prepare_connection(conn)
+        if !conn
           RJ.logger.info("Connecting to #{RJ.config.servers.first.to_s}...")
-          AMQP.connection = AMQP.connect(RJ.config.servers.first, auto_recovery: AUTO_RECOVERY_ENABLED)
-          init_auto_recovery if AUTO_RECOVERY_ENABLED
+          conn = AMQP.connect(RJ.config.servers.first, auto_recovery: AUTO_RECOVERY_ENABLED)
+          init_auto_recovery(conn) if AUTO_RECOVERY_ENABLED
+        elsif conn.closed?
+          conn.reconnect
         end
+        conn
       end
 
-      def prepare_channel
-        AMQP.channel ||= AMQP::Channel.new(AMQP.connection, auto_recovery: AUTO_RECOVERY_ENABLED)
+      def create_channel(connection)
+        AMQP::Channel.new(connection, auto_recovery: AUTO_RECOVERY_ENABLED)
       end
 
-      def init_auto_recovery
-        unless $auto_recovery_initiated
-          $auto_recovery_initiated = true
-
-          AMQP.connection.on_recovery do |conn, opts|
-            HOSTS_DEAD.clear
-            HOSTS_FAILED.clear
-            url = url_from_opts opts
-            RJ.logger.warn "Connection to #{url} recovered."
-          end
+      def init_auto_recovery(connection)
+        connection.on_recovery do |conn, opts|
+          HOSTS_DEAD.clear
+          HOSTS_FAILED.clear
+          url = url_from_opts opts
+          RJ.logger.warn "Connection to #{url} recovered."
+        end
 
-          AMQP.connection.on_open do |conn, opts|
-            RJ.logger.info "Connected."
-          end
+        connection.on_open do |conn, opts|
+          RJ.logger.info "Connected."
+        end
 
-          AMQP.connection.on_tcp_connection_loss do |conn, opts|
-            sleep 2
-            restore_from_connection_failure(opts)
-          end
+        connection.on_tcp_connection_loss do |conn, opts|
+          sleep 2
+          restore_from_connection_failure(conn, opts)
+        end
 
-          AMQP.connection.on_tcp_connection_failure do |opts|
-            sleep 2
-            restore_from_connection_failure(opts)
-          end
+        connection.on_tcp_connection_failure do |opts|
+          sleep 2
+          restore_from_connection_failure(connection, opts)
+        end
 
 
-          # AMQP.connection.before_recovery do |conn, opts|
-          #   RJ.logger.info "before_recovery"
-          # end
+        # connection.before_recovery do |conn, opts|
+        #   RJ.logger.info "before_recovery"
+        # end
 
-          # AMQP.connection.on_possible_authentication_failure do |conn, opts|
-          #   puts opts.inspect
-          #   # restore_from_connection_failure(opts)
-          # end
+        # connection.on_possible_authentication_failure do |conn, opts|
+        #   puts opts.inspect
+        #   # restore_from_connection_failure(conn, opts)
+        # end
 
-          # AMQP.connection.on_connection_interruption do |conn|
-          #   # restore_from_connection_failure(opts)
-          # end
-        end
+        # connection.on_connection_interruption do |conn|
+        #   # restore_from_connection_failure(conn, opts)
+        # end
       end
 
       private
 
-      def restore_from_connection_failure(opts)
+      def restore_from_connection_failure(connection, opts)
         url = opts.empty? ? RJ.config.servers.first : url_from_opts(opts)
         HOSTS_FAILED[url] ||= Time.now
 
@@ -77,24 +76,24 @@ module RabbitJobs
           HOSTS_DEAD.push(url) unless HOSTS_DEAD.include?(url)
           new_url = (RJ.config.servers.dup - HOSTS_DEAD.dup).first
           if new_url
-            reconnect_to(new_url)
+            reconnect_to(connection, new_url)
           else
             # all hosts is dead
           end
         else
           # reconnect to the same host
-          reconnect_to(url)
+          reconnect_to(connection, url)
         end
       end
 
-      def reconnect_to(url)
-        if AMQP.connection
+      def reconnect_to(connection, url)
+        if connection
           RJ.logger.warn "Trying to reconnect to #{url}..."
-          AMQP.connection.reconnect_to(url, 2)
+          connection.reconnect_to(url, 2)
         else
           RJ.logger.warn "Trying to connect to #{url}..."
-          AMQP.connection = AMQP.connect(url, auto_recovery: true)
-          init_auto_recovery
+          connection = AMQP.connect(url, auto_recovery: true)
+          init_auto_recovery(connection)
         end
       end
 

data/lib/rabbit_jobs/publisher.rb

@@ -9,6 +9,17 @@ module RabbitJobs
   module Publisher
     extend self
 
+    mattr_accessor :_connection
+    mattr_accessor :_channel
+
+    def amqp_connection
+      self._connection ||= AmqpHelper.prepare_connection(self._connection)
+    end
+
+    def amqp_channel
+      self._channel ||= AmqpHelper.create_channel(self._connection)
+    end
+
     def publish(klass, *params, &block)
       publish_to(RJ.config.default_queue, klass, *params, &block)
     end
@@ -31,16 +42,16 @@ module RabbitJobs
       raise ArgumentError.new("Need to pass exchange name") if ex.size > 0 && ex[:name].to_s.empty?
 
       begin
-        AmqpHelper.prepare_channel
+        amqp_connection
 
         if ex.size > 0
-          AMQP::Exchange.new(AMQP.channel, :direct, ex[:name].to_s, Configuration::DEFAULT_EXCHANGE_PARAMS.merge(ex[:params] || {})) do |exchange|
+          AMQP::Exchange.new(self.amqp_channel, :direct, ex[:name].to_s, Configuration::DEFAULT_EXCHANGE_PARAMS.merge(ex[:params] || {})) do |exchange|
             exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_sym})) do
               yield if block_given?
             end
           end
         else
-          AMQP.channel.default_exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_sym})) do
+          self.amqp_channel.default_exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_sym})) do
             yield if block_given?
           end
         end
@@ -59,11 +70,9 @@ module RabbitJobs
       messages_count = 0
       count = routing_keys.count
 
-      AmqpHelper.prepare_channel
-
       routing_keys.map(&:to_sym).each do |routing_key|
         queue_name = RJ.config.queue_name(routing_key)
-        AMQP.channel.queue(queue_name, RJ.config[:queues][routing_key]) do |queue, declare_ok|
+        self.amqp_channel.queue(queue_name, RJ.config[:queues][routing_key]) do |queue, declare_ok|
           queue.status do |messages, consumers|
             queue.purge do |ret|
               RJ.logger.error "Cannot purge queue #{queue_name}." unless ret.is_a?(AMQ::Protocol::Queue::PurgeOk)

data/lib/rabbit_jobs/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module RabbitJobs
-  VERSION = "0.4.14"
+  VERSION = "0.5.0"
 end

data/lib/rabbit_jobs/worker.rb

@@ -4,6 +4,16 @@ module RabbitJobs
   class Worker
     attr_accessor :pidfile, :background, :process_name, :worker_pid
 
+    attr_accessor :_connection, :_channel
+
+    def amqp_connection
+      self._connection ||= AmqpHelper.prepare_connection(self._connection)
+    end
+
+    def amqp_channel
+      self._channel ||= AmqpHelper.create_channel(self._connection)
+    end
+
     def process_message(metadata, payload)
       job = RJ::Job.parse(payload)
 
@@ -73,18 +83,16 @@ module RabbitJobs
               RJ.logger.info "Stopped."
 
               File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
-              # RJ.logger.close
-              # exit!
             end
           }
 
-          AmqpHelper.prepare_channel
-          AMQP.channel.prefetch(1)
+          amqp_connection
+          amqp_channel.prefetch(1)
 
           queues.each do |routing_key|
             routing_key = routing_key.to_sym
 
-            AMQP.channel.queue(queue_name(routing_key), queue_params(routing_key)) { |queue, declare_ok|
+            amqp_channel.queue(queue_name(routing_key), queue_params(routing_key)) { |queue, declare_ok|
               explicit_ack = !!queue_params(routing_key)[:ack]
 
               RJ.logger.info "Subscribing to #{queue_name(routing_key)}"
@@ -93,6 +101,8 @@ module RabbitJobs
                   processed_count += 1 if process_message(metadata, payload)
                 rescue
                   RJ.logger.warn "process_message failed. payload: #{payload.inspect}"
+                  RJ.logger.warn $!.inspect
+                  $!.backtrace.each {|l| RJ.logger.warn l}
                 end
 
                 metadata.ack if explicit_ack

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.4.14
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-14 00:00:00.000000000 Z
+date: 2013-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &10943520 !ruby/object:Gem::Requirement
+  requirement: &13074180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *10943520
+  version_requirements: *13074180
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10942260 !ruby/object:Gem::Requirement
+  requirement: &13073280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10942260
+  version_requirements: *13073280
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &10940980 !ruby/object:Gem::Requirement
+  requirement: &13072060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10940980
+  version_requirements: *13072060
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10940040 !ruby/object:Gem::Requirement
+  requirement: &13466020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10940040
+  version_requirements: *13466020
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -115,7 +115,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2117076599747944409
+      hash: -1416154192839369945
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -124,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2117076599747944409
+      hash: -1416154192839369945
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11