rabbit_jobs 0.2.0.pre1 → 0.2.0.pre2

data/lib/rabbit_jobs/amqp_helper.rb

@@ -14,6 +14,7 @@ module RabbitJobs
           yield false
         else
           AMQP.start(RJ.config.url) {
+            AmqpHelper.init_auto_recovery
             yield true
           }
         end
@@ -29,6 +30,19 @@ module RabbitJobs
 
       private
 
+      def init_auto_recovery
+        AMQP.connection.on_recovery do |conn, opts|
+          url = url_from_opts opts
+          RJ.logger.warn "[network failure] Connection to #{url} established."
+        end
+
+        AMQP.connection.on_tcp_connection_loss do |conn, opts|
+          url = url_from_opts opts
+          RJ.logger.warn "[network failure] Trying to reconnect to #{url}..."
+          conn.reconnect(false, 2)
+        end
+      end
+
       def url_from_opts(opts = {})
         s = ""
         s << opts[:scheme]
@@ -41,16 +55,6 @@ module RabbitJobs
 
       def create_channel
         AMQP.channel = AMQP::Channel.new(AMQP.connection, auto_recovery: true)
-
-        AMQP.connection.on_recovery do |conn, opts|
-          url = url_from_opts opts
-          RJ.logger.warn "[network failure] Connection to #{url} established."
-        end
-        AMQP.connection.on_tcp_connection_loss do |conn, opts|
-          url = url_from_opts opts
-          RJ.logger.warn "[network failure] Trying to reconnect to #{url}..."
-          conn.reconnect(false, 2)
-        end
       end
     end
   end

data/lib/rabbit_jobs/scheduler.rb

@@ -66,6 +66,7 @@ module RabbitJobs
       RJ.publish_to(queue, klass_name, *params)
     rescue
       RJ.logger.warn "Failed to publish #{klass_name}:\n #{$!}\n params = #{params.inspect}"
+      RJ.logger.warn $!.inspect
     end
 
     def rufus_scheduler
@@ -87,19 +88,14 @@ module RabbitJobs
       $0 = self.process_name || "rj_scheduler"
 
       processed_count = 0
-      AmqpHelper.with_amqp do |connection, stop_em|
-        channel = AMQP::Channel.new(connection)
-
-        channel.on_error do |ch, channel_close|
-          puts "Channel-level error: #{channel_close.reply_text}, shutting down..."
-          connection.disconnect { EM.stop }
-        end
+      AmqpHelper.with_amqp do |stop_em|
+        AmqpHelper.prepare_channel
 
         load_schedule!
 
         check_shutdown = Proc.new {
           if @shutdown
-            connection.close {
+            AMQP::connection.disconnect {
               File.delete(self.pidfile) if self.pidfile
               EM.stop { exit! }
             }

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.2.0.pre1"
+  VERSION = "0.2.0.pre2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre1
+  version: 0.2.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -113,7 +113,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1227131973983864781
+      hash: 1731730238490363381
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: