rabbit_jobs 0.4.11 → 0.4.12

data/examples/client

@@ -13,9 +13,7 @@ end
 
 RJ.configure { |c|
   c.queue "failover_test"
-  c.server "amqp://dev.lan/"
   c.server "amqp://localhost/"
-
 }
 
 RJ.logger = Logger.new($stdout)
@@ -35,16 +33,16 @@ RJ.run {
 }
 
 
-# 1000.times {
-#   RJ.run do
-#     count = 10000
-#     published = 0
-#     count.times {
-#       RJ.publish_to(:default, MyCurrentJob) {
-#         published += 1
-#         RJ.stop if published >= count
-#       }
-#     }
-#   end
-#   puts 'returned from em'
-# }
+1000.times {
+  RJ.run do
+    count = 10000
+    published = 0
+    count.times {
+      RJ.publish_to(:default, MyCurrentJob) {
+        published += 1
+        RJ.stop if published >= count
+      }
+    }
+  end
+  puts 'returned from em'
+}

data/lib/rabbit_jobs/amqp_helper.rb

@@ -9,19 +9,20 @@ module RabbitJobs
     RECOVERY_TIMEOUT = 3
     HOSTS_DEAD = []
     HOSTS_FAILED = {}
+    AUTO_RECOVERY_ENABLED = true
 
     class << self
 
       def prepare_connection
         if !AMQP.connection || AMQP.connection.closed?
           RJ.logger.info("Connecting to #{RJ.config.servers.first.to_s}...")
-          AMQP.connection = AMQP.connect(RJ.config.servers.first, auto_recovery: true)
-          init_auto_recovery
+          AMQP.connection = AMQP.connect(RJ.config.servers.first, auto_recovery: AUTO_RECOVERY_ENABLED)
+          init_auto_recovery if AUTO_RECOVERY_ENABLED
         end
       end
 
       def prepare_channel
-        AMQP.channel ||= AMQP::Channel.new(AMQP.connection, auto_recovery: true)
+        AMQP.channel ||= AMQP::Channel.new(AMQP.connection, auto_recovery: AUTO_RECOVERY_ENABLED)
       end
 
       def init_auto_recovery
@@ -39,6 +40,17 @@ module RabbitJobs
             RJ.logger.info "Connected."
           end
 
+          AMQP.connection.on_tcp_connection_loss do |conn, opts|
+            sleep 2
+            restore_from_connection_failure(opts)
+          end
+
+          AMQP.connection.on_tcp_connection_failure do |opts|
+            sleep 2
+            restore_from_connection_failure(opts)
+          end
+
+
           # AMQP.connection.before_recovery do |conn, opts|
           #   RJ.logger.info "before_recovery"
           # end
@@ -48,19 +60,9 @@ module RabbitJobs
           #   # restore_from_connection_failure(opts)
           # end
 
-          AMQP.connection.on_tcp_connection_loss do |conn, opts|
-            sleep 2
-            restore_from_connection_failure(opts)
-          end
-
           # AMQP.connection.on_connection_interruption do |conn|
           #   # restore_from_connection_failure(opts)
           # end
-
-          AMQP.connection.on_tcp_connection_failure do |opts|
-            sleep 2
-            restore_from_connection_failure(opts)
-          end
         end
       end
 
@@ -99,13 +101,20 @@ module RabbitJobs
       def url_from_opts(opts = {})
         return "" unless opts
         return "" if opts.empty?
+
+        scheme = opts[:scheme] || "amqp"
+        vhost = opts[:vhost] || "/"
+        vhost = "/#{vhost}" unless vhost[0] == '/'
+        use_default_port = (scheme == 'amqp' && opts[:port] == 5672) || (scheme == 'amqps' && opts[:port] == 5673)
+        use_default_credentials = opts[:user] == 'guest' && opts[:pass] == 'guest'
+
         s = ""
-        s << (opts[:scheme] || "amqp")
+        s << scheme
         s << "://"
-        s << "#{opts[:user]}@" if opts[:user] && !opts[:user].empty? && opts[:user] != 'guest'
+        s << "#{opts[:user]}:#{opts[:pass]}@" unless use_default_credentials
         s << opts[:host]
-        s << ":#{opts[:port]}" unless (opts[:scheme] == 'amqp' && opts[:port] == 5672) || (opts[:scheme] == 'amqps' && opts[:port] == 5673)
-        s << opts[:vhost] if opts[:vhost] && !opts[:vhost].empty? && opts[:vhost] != "/"
+        s << ":#{opts[:port]}" unless use_default_port
+        s << vhost
         s
       end
     end

data/lib/rabbit_jobs/configuration.rb

@@ -63,10 +63,10 @@ module RabbitJobs
     def initialize
       @data = {
         error_log: true,
-        workers: HashWithIndifferentAccess.new,
+        workers: {},
         servers: [],
         prefix: 'rabbit_jobs',
-        queues: HashWithIndifferentAccess.new
+        queues: {}
       }
     end
 
@@ -127,7 +127,7 @@ module RabbitJobs
       raise ArgumentError.new("name is #{name.inspect}") unless name && name.is_a?(String) && name != ""
       raise ArgumentError.new("params is #{params.inspect}") unless params && params.is_a?(Hash)
 
-      name = name.downcase
+      name = name.downcase.to_sym
 
       if @data[:queues][name]
         @data[:queues][name].merge!(params)
@@ -137,7 +137,7 @@ module RabbitJobs
     end
 
     def workers
-      @data[:workers] ||= HashWithIndifferentAccess.new
+      @data[:workers] ||= {}
     end
 
     def worker(name, params = {})
@@ -145,9 +145,9 @@ module RabbitJobs
       raise ArgumentError.new("params is #{params.inspect}") unless params && params.is_a?(Hash)
       raise ArgumentError.new("params should have :instances and :queues keys.") unless params[:instances] && params[:queues]
 
-      name = name.downcase
+      name = name.downcase.to_sym
 
-      @data[:workers] ||= HashWithIndifferentAccess.new
+      @data[:workers] ||= {}
       if @data[:workers][name]
         @data[:workers][name].merge!(params)
       else
@@ -163,12 +163,17 @@ module RabbitJobs
       queue('default', DEFAULT_QUEUE_PARAMS) if @data[:queues].empty?
     end
 
+    def worker_queues
+      @data[:workers].values.map{|w| w[:queues].to_s.split(' ')}.flatten.uniq.sort
+    end
+
     def default_queue
       queue('default', DEFAULT_QUEUE_PARAMS) if @data[:queues].empty?
-      key = @data[:queues].keys.first
+      worker_queues.first
     end
 
     def queue_name(routing_key)
+      routing_key = routing_key.to_sym
       @data[:queues][routing_key][:ignore_prefix] ? routing_key : [@data[:prefix], routing_key].join('#')
     end
 

data/lib/rabbit_jobs/publisher.rb

@@ -15,7 +15,7 @@ module RabbitJobs
 
     def publish_to(routing_key, klass, *params, &block)
       raise ArgumentError.new("klass=#{klass.inspect}") unless klass && (klass.is_a?(Class) || klass.is_a?(String))
-      raise ArgumentError.new("routing_key=#{routing_key}") unless routing_key && (routing_key.is_a?(Symbol) || routing_key.is_a?(String)) && !!RJ.config[:queues][routing_key.to_s]
+      raise ArgumentError.new("routing_key=#{routing_key}") unless routing_key && (routing_key.is_a?(Symbol) || routing_key.is_a?(String)) && !!RJ.config[:queues][routing_key.to_sym]
 
       payload = {
         'class' => klass.to_s,
@@ -23,7 +23,7 @@ module RabbitJobs
         'params' => params
         }.to_json
 
-      direct_publish_to(RJ.config.queue_name(routing_key.to_s), payload, &block)
+      direct_publish_to(RJ.config.queue_name(routing_key.to_sym), payload, &block)
     end
 
     def direct_publish_to(routing_key, payload, ex = {}, &block)
@@ -35,12 +35,12 @@ module RabbitJobs
 
         if ex.size > 0
           AMQP::Exchange.new(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_s})) do
+            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_s})) do
+          AMQP.channel.default_exchange.publish(payload, Configuration::DEFAULT_MESSAGE_PARAMS.merge({key: routing_key.to_sym})) do
             yield if block_given?
           end
         end
@@ -61,20 +61,23 @@ module RabbitJobs
 
       AmqpHelper.prepare_channel
 
-      routing_keys.each do |routing_key|
-        queue = AMQP.channel.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key.to_s])
-        queue.status do |messages, consumers|
-          # messages_count += messages
-          queue.purge do |ret|
-            raise "Cannot purge queue #{routing_key.to_s}." unless ret.is_a?(AMQ::Protocol::Queue::PurgeOk)
-            messages_count += ret.message_count
-            count -= 1
-            if count == 0
-              yield messages_count if block_given?
+      routing_keys.map(&:to_s).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|
+          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)
+              messages_count += ret.message_count
+              count -= 1
+              if count == 0
+                yield(messages_count) if block_given?
+              end
             end
           end
         end
       end
+
+      messages_count
     end
   end
 end

data/lib/rabbit_jobs/tasks.rb

@@ -32,13 +32,15 @@ namespace :rj do
     task :start => [:environment, :load_config] do
       make_dirs
       RJ.config.workers.each do |worker_name, worker_props|
-        worker_num = 1
-        worker_props['instances'].to_i.times do
+        puts worker_props.inspect
+        (1..worker_props[:instances].to_i).each do |worker_num|
           unless @do_only.count > 0 && !@do_only.include?("#{worker_name}-#{worker_num}")
-            queues = (worker_props['queue'] || worker_props['queues'] || "").split(' ')
+            $stdout.puts 'initializing worker'
+            queues = (worker_props[:queue] || worker_props[:queues] || "").split(' ')
 
             worker = RJ::Worker.new(*queues)
             worker.background = true
+            worker.background = false
             worker.process_name = "rj_worker #{worker_name}##{worker_num} #{rails_env} [#{queues.join(',')}]"
             worker.pidfile = app_root.join("tmp/pids/rj_worker_#{rails_env}_#{worker_name}_#{worker_num}.pid")
             RJ.logger = ::Logger.new(app_root.join("log/rj_worker_#{rails_env}_#{worker_name}_#{worker_num}.log"), 'daily')
@@ -50,7 +52,6 @@ namespace :rj do
             # завершаем копию процесса, если воркер уже отработал
             exit! if worker.work
           end
-          worker_num += 1
         end
       end
     end
@@ -62,7 +63,7 @@ namespace :rj do
 
       RJ.config.workers.each do |worker_name, worker_props|
         worker_num = 1
-        worker_props['instances'].to_i.times do
+        worker_props[:instances].to_i.times do
           unless (@do_only.count > 0) && !@do_only.include?("#{worker_name}-#{worker_num}")
             pidfile = app_root.join("tmp/pids/rj_worker_#{rails_env}_#{worker_name}_#{worker_num}.pid")
 
@@ -73,7 +74,7 @@ namespace :rj do
             else
               pid = open(pidfile).read.to_i
               pids[pid] = pidfile
-              queues = (worker_props['queue'] || worker_props['queues'] || "").split(' ')
+              queues = (worker_props[:queue] || worker_props[:queues] || "").split(' ')
               puts "Stopping rj_worker #{worker_name}##{worker_num} #{rails_env} [#{queues.join(',')}]"
             end
           end
@@ -119,7 +120,7 @@ namespace :rj do
 
       RJ.config.workers.each do |worker_name, worker_props|
         worker_num = 1
-        worker_props['instances'].to_i.times do
+        worker_props[:instances].to_i.times do
           pidfile = app_root.join("tmp/pids/rj_worker_#{rails_env}_#{worker_name}_#{worker_num}.pid")
 
           unless File.exists?(pidfile)

data/lib/rabbit_jobs/version.rb

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

data/lib/rabbit_jobs/worker.rb

@@ -53,14 +53,14 @@ module RabbitJobs
     end
 
     def queues
-      @queues || ['default']
+      @queues || [:default]
     end
 
     # Subscribes to queue and working on jobs
     def work(time = 0)
       return false unless startup
 
-      $0 = self.process_name || "rj_worker (#{queues.join(',')})"
+      $0 = self.process_name || "rj_worker (#{queues.join(', ')})"
 
       processed_count = 0
 
@@ -79,9 +79,11 @@ module RabbitJobs
           }
 
           AmqpHelper.prepare_channel
+          AMQP.channel.prefetch(1)
 
           queues.each do |routing_key|
-            AMQP.channel.prefetch(1)
+            routing_key = routing_key.to_sym
+
             AMQP.channel.queue(queue_name(routing_key), queue_params(routing_key)) { |queue, declare_ok|
               explicit_ack = !!queue_params(routing_key)[:ack]
 

data/lib/rabbit_jobs.rb

@@ -97,14 +97,16 @@ module RabbitJobs
     if RJ.running?
       RJ::Publisher.purge_queue(*routing_keys, &block)
     else
+      messages_count = 0
       RJ.run {
         RJ::Publisher.purge_queue(*routing_keys) { |count|
+          messages_count = count
           RJ.stop {
-            yield if block_given?
-            return count
+            yield(count) if block_given?
           }
         }
       }
+      messages_count
     end
   end
 

data/spec/unit/worker_spec.rb

@@ -8,7 +8,7 @@ describe RabbitJobs::Worker do
     end
 
     it '#initialize with default options' do
-      @worker.queues.should == ['default']
+      @worker.queues.should == [:default]
     end
 
     it '#startup should set @shutdown to false' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-12 00:00:00.000000000 Z
+date: 2013-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &19887240 !ruby/object:Gem::Requirement
+  requirement: &14934660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *19887240
+  version_requirements: *14934660
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &19886380 !ruby/object:Gem::Requirement
+  requirement: &14933760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19886380
+  version_requirements: *14933760
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &19885520 !ruby/object:Gem::Requirement
+  requirement: &14932340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19885520
+  version_requirements: *14932340
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19884380 !ruby/object:Gem::Requirement
+  requirement: &14931420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *19884380
+  version_requirements: *14931420
 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: -3095640351894679385
+      hash: 3434241684722293516
 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: -3095640351894679385
+      hash: 3434241684722293516
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11