rabbit_jobs 0.4.5 → 0.4.6

data/lib/rabbit_jobs/version.rb

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

data/lib/rabbit_jobs/worker.rb

@@ -4,6 +4,27 @@ module RabbitJobs
   class Worker
     attr_accessor :pidfile, :background, :process_name, :worker_pid
 
+    def process_message(metadata, payload)
+      job = RJ::Job.parse(payload)
+
+      if job.is_a?(Symbol)
+        # case @job
+        # when :not_found
+        # when :parsing_error
+        # when :error
+        # end
+      else
+        if job.expired?
+          RJ.logger.warn "Job expired: #{job.to_ruby_string}"
+          false
+        else
+          job.run_perform
+        end
+      end
+
+      true
+    end
+
     # Workers should be initialized with an array of string queue
     # names. The order is important: a Worker will check the first
     # queue given for a job. If none is found, it will check the
@@ -54,31 +75,17 @@ module RabbitJobs
           queues.each do |routing_key|
             AMQP.channel.prefetch(1)
             AMQP.channel.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key]) { |queue, declare_ok|
-              RJ.logger.info "Subscribed to #{RJ.config.queue_name(routing_key)}(#{declare_ok.to_i + 1})"
-
               explicit_ack = !!RJ.config[:queues][routing_key][:ack]
 
+              RJ.logger.info "Subscribing to #{RJ.config.queue_name(routing_key)}"
               queue.subscribe(ack: explicit_ack) do |metadata, payload|
-                @job = RJ::Job.parse(payload)
-
-                if @job.is_a?(Symbol)
-                  # case @job
-                  # when :not_found
-                  # when :parsing_error
-                  # when :error
-                  # end
-                  metadata.ack if explicit_ack
-                else
-                  if @job.expired?
-                    RJ.logger.warn "Job expired: #{@job.to_ruby_string}"
-                  else
-                    @job.run_perform
-                    processed_count += 1
-                  end
-
-                  metadata.ack if explicit_ack
+                begin
+                  processed_count += 1 if process_message(metadata, payload)
+                rescue
+                  RJ.logger.warn "process_message failed: #{{metadata: metadata, payload: payload}.inspect}"
                 end
 
+                metadata.ack if explicit_ack
                 check_shutdown.call
               end
             }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-04 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &10959520 !ruby/object:Gem::Requirement
+  requirement: &14548120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *10959520
+  version_requirements: *14548120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &10958660 !ruby/object:Gem::Requirement
+  requirement: &14546840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *10958660
+  version_requirements: *14546840
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &10957860 !ruby/object:Gem::Requirement
+  requirement: &14544680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10957860
+  version_requirements: *14544680
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &10957020 !ruby/object:Gem::Requirement
+  requirement: &14543340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
   type: :runtime
   prerelease: false
-  version_requirements: *10957020
+  version_requirements: *14543340
 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: 1163928231498999905
+      hash: 4141975649381852008
 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: 1163928231498999905
+      hash: 4141975649381852008
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11