rabbit_jobs 0.8.14 → 0.8.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b36bac6d10a75651ca967f661fb7d309d243c4fb
-  data.tar.gz: 008abc62612381f00de048bf8173384636f81215
+  metadata.gz: 9a35a18641e303ebfd0d957c9b93cb632e7b24c2
+  data.tar.gz: ba95220f67bcb5cf0184e8b43561b2aa20b0c491
 SHA512:
-  metadata.gz: eb972896e3792069dfa00eaedd5f2371e78fbfd617d6d500b89ff9feb5d00a8664cf53c2c22f5b6d5fcae84f88630fe024eb1248990e5594b63549a34380a680
-  data.tar.gz: b1186445bb437099c472870b6b948b13b265c0c6e36d6f3240102dd1fe2cc3cf0315718089954ffa6b8f14a130aaad3c965b8ce85c6468b84925d6c992e35fad
+  metadata.gz: 578beb9e51c8e2b4a6c6b4f021a6e67699c37aac28a1469618c6eb0fbcd802e708d259d02489c507fa07fa7234ae3c81381956f0d8156ea167fc4a81258c31bf
+  data.tar.gz: 2c2165684095c11649448a4bb573b18fd599a32680952249bb3b9b1a31b1408976b8469ec73b3f666e6ee341b2cc6fc85aec451ac2de9bf75fbde8c1ebf22696

data/examples/bunny

@@ -3,24 +3,33 @@
 
 require 'bunny'
 
+confirm = true
+confirm = false
 
-b = Bunny.new "amqp://localhost/bunny", heartbeat: 2
+b = Bunny.new "amqp://localhost/bunny", heartbeat: 2, threaded: true, automatically_recover: true
 b.start
 channel = b.create_channel
-# channel.confirm_select
+# channel.confirm_select if confirm
 exchange = channel.default_exchange
 
 i = 0
 loop do
-  puts "publishing hello #{i}"
+  # puts "publishing hello #{i}"
   begin
-    exchange.publish("hello #{i}", routing_key: "hello")
-    # channel.wait_for_confirms
+    # puts "connected? #{b.connected?.inspect}, status: #{b.status.inspect}"
+    puts "publishing #{i}"
+    if exchange.publish("hello #{i}", routing_key: "hello").channel.connection.connected?
+      puts "published  #{i}"
+    else
+      puts "cannot publish #{i}"
+    end
+    # channel.wait_for_confirms if confirm
   rescue Exception => e
     puts e.message
     puts e.backtrace.join("\r\n")
   end
   i += 1
+  puts
   sleep 1
 end
 

data/examples/bunny_server

@@ -9,9 +9,10 @@ require 'bunny'
 # }
 
 
-b = Bunny.new "amqp://localhost/bunny"
+b = Bunny.new "amqp://localhost/bunny", heartbeat: 2, threaded: true, automatically_recover: true
 b.start
 channel = b.create_channel
+channel.prefetch(1)
 queue = channel.queue("hello", durable: true)
 
 queue.subscribe do |delivery_info, properties, payload|
@@ -19,5 +20,5 @@ queue.subscribe do |delivery_info, properties, payload|
 end
 
 loop do
-  sleep 1
+  sleep 0.1
 end

data/examples/client

@@ -7,28 +7,38 @@ require File.expand_path('../../lib/rabbit_jobs', __FILE__)
 
 class MyCurrentJob
   include RJ::Job
-  queue :failover_test
+  queue :mandarin
   def perform(count)
   end
 end
 
 RJ.configure { |c|
-  c.queue "failover_test"
+  c.queue "mandarin", durable: true, auto_delete: false, ack: true, arguments: {'x-ha-policy' => 'all'}
   c.server "amqp://localhost/rj"
 }
 
+shutdown = false
+trap('INT') do
+  shutdown = true
+end
+
 i = 0
 loop do
   puts "publishing job #{i}"
   begin
-    # RJ.publish_to(:failover_test, MyCurrentJob, i)
+    # RJ.publish_to(:mandarin, MyCurrentJob, i)
     MyCurrentJob.perform_async(i)
   rescue Exception => e
-    # RJ::Publisher.amqp_connection.stop
     puts e.message
     puts e.backtrace.join("\r\n")
-    raise $!
   end
+
+  if shutdown
+    puts "closing connection."
+    RJ::Publisher.send(:connection).stop
+    break
+  end
+
   i += 1
   sleep 1
-end
+end

data/examples/worker

@@ -14,7 +14,7 @@ class MyCurrentJob
 end
 
 RJ.configure { |c|
-  c.queue "failover_test"
+  c.queue "mandarin", durable: true, auto_delete: false, ack: true, arguments: {'x-ha-policy' => 'all'}
   c.server "amqp://localhost/rj"
 }
 

data/lib/rabbit_jobs.rb

@@ -14,7 +14,6 @@ require 'active_support/core_ext'
 require 'rabbit_jobs/version'
 
 require 'rabbit_jobs/helpers'
-require 'rabbit_jobs/amqp_helper'
 require 'rabbit_jobs/configuration'
 require 'rabbit_jobs/error_mailer'
 

data/lib/rabbit_jobs/main_loop.rb

@@ -21,6 +21,7 @@ module RabbitJobs
 
         if @shutdown
           RabbitJobs.logger.info "Stopping."
+          amqp_connection.stop
           yield if block_given?
           return true
         end

data/lib/rabbit_jobs/publisher.rb

@@ -21,11 +21,12 @@ module RabbitJobs
 
     def direct_publish_to(routing_key, payload, ex = {})
       ex = {name: ex.to_s} unless ex.is_a?(Hash)
-      check_connection
       begin
         exchange_opts = Configuration::DEFAULT_MESSAGE_PARAMS.merge(ex || {})
         exchange_name = exchange_opts.delete(:name).to_s
-        connection.default_channel.basic_publish(payload, exchange_name, routing_key, exchange_opts)
+        unless connection.default_channel.basic_publish(payload, exchange_name, routing_key, exchange_opts).connection.connected?
+          raise "Disconnected from #{RJ.config.server}. Connection status: #{connection.try(:status).inspect}"
+        end
       rescue
         RabbitJobs.logger.warn $!.message
         RabbitJobs.logger.warn $!.backtrace.join("\n")
@@ -37,7 +38,6 @@ module RabbitJobs
 
     def purge_queue(*routing_keys)
       raise ArgumentError unless routing_keys.present?
-      check_connection
 
       messages_count = 0
       routing_keys.map(&:to_sym).each do |routing_key|
@@ -57,19 +57,10 @@ module RabbitJobs
 
     def connection
       unless settings[:connection]
-        settings[:connection] = Bunny.new(RabbitJobs.config.server, :heartbeat_interval => 5)
+        settings[:connection] = Bunny.new(RabbitJobs.config.server)
         settings[:connection].start
-        # settings[:channel] = settings[:connection].create_channel
-        # settings[:channel].confirm_select
       end
       settings[:connection]
     end
-
-    def check_connection
-      unless connection.connected?
-        connection.start if connection.status == :disconnected
-        raise "Disconnected from #{RJ.config.server}. Connection status: #{connection.try(:status).inspect}" unless connection.connected?
-      end
-    end
   end
 end

data/lib/rabbit_jobs/version.rb

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

data/lib/rabbit_jobs/worker.rb

@@ -13,7 +13,7 @@ module RabbitJobs
     end
 
     def amqp_connection
-      Thread.current[:rj_worker_connection] ||= AmqpHelper.prepare_connection
+      Thread.current[:rj_worker_connection] ||= Bunny.new(RabbitJobs.config.server, automatically_recover: false).start
     end
 
     def self.cleanup
@@ -113,7 +113,9 @@ module RabbitJobs
     def consume_queue(amqp_channel, routing_key)
       RJ.logger.info "Subscribing to #{routing_key}"
       routing_key = routing_key.to_sym
+
       queue = amqp_channel.queue(routing_key, queue_params(routing_key))
+
       explicit_ack = !!queue_params(routing_key)[:ack]
 
       queue.subscribe(ack: explicit_ack) do |delivery_info, properties, payload|

data/rabbit_jobs.gemspec

@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = RabbitJobs::VERSION
 
-  gem.add_dependency "bunny", "0.9.0"
+  gem.add_dependency "bunny", "0.9.1"
   gem.add_dependency "rake"
   gem.add_dependency "rufus-scheduler", "~> 2.0"
   gem.add_dependency "rails", "~> 3.2"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.8.14
+  version: 0.8.15
 platform: ruby
 authors:
 - Pavel Lazureykis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bunny
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.9.0
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -86,7 +86,6 @@ files:
 - examples/configuration.rb
 - examples/worker
 - lib/rabbit_jobs.rb
-- lib/rabbit_jobs/amqp_helper.rb
 - lib/rabbit_jobs/configuration.rb
 - lib/rabbit_jobs/consumer/job_consumer.rb
 - lib/rabbit_jobs/error_mailer.rb

data/lib/rabbit_jobs/amqp_helper.rb

@@ -1,16 +0,0 @@
-# -*- encoding : utf-8 -*-
-
-module RabbitJobs
-  class AmqpHelper
-
-    class << self
-
-      def prepare_connection
-        conn = Bunny.new(RabbitJobs.config.server, :heartbeat_interval => 5)
-        conn.start unless conn.connected? || conn.connecting?
-        conn
-      end
-
-    end
-  end
-end