rabbit_jobs 0.2.0.pre4 → 0.3

data/lib/rabbit_jobs/util.rb

@@ -10,7 +10,7 @@ module RabbitJobs
           pid = File.read(pidfile).to_i
           begin
             Process.kill(0, pid)
-            RJ.logger.info "Killing old rabbit_jobs process ##{pid}"
+            RJ.logger.info "Killing stale rj_worker[##{pid}]"
             Process.kill("TERM", pid)
 
             while Process.kill(0, pid)

data/lib/rabbit_jobs/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding : utf-8 -*-
 
 module RabbitJobs
-  VERSION = "0.2.0.pre4"
+  VERSION = "0.3"
 end

data/lib/rabbit_jobs/worker.rb

@@ -27,62 +27,61 @@ module RabbitJobs
       @queues || ['default']
     end
 
-    # Subscribes to channel and working on jobs
+    # Subscribes to queue and working on jobs
     def work(time = 0)
       return false unless startup
 
       $0 = self.process_name || "rj_worker (#{queues.join(',')})"
 
       processed_count = 0
-      RJ.logger.info("Connecting to amqp...")
 
       begin
-        AmqpHelper.with_amqp do |stop_em|
-          AmqpHelper.prepare_channel
-          AMQP.channel.prefetch(1)
-
+        RJ.run do
           check_shutdown = Proc.new {
             if @shutdown
-              RJ.logger.info "Processed jobs: #{processed_count}"
-              RJ.logger.info "Stopping worker ##{Process.pid}..."
-
-              AMQP.connection.disconnect {
+              RJ.stop {
                 File.delete(self.pidfile) if self.pidfile && File.exists?(self.pidfile)
-                RJ.logger.info "##{Process.pid} stopped."
-                RJ.logger.close
-
-                EM.stop {
-                  exit!
-                }
               }
+              RJ.logger.info "rj_worker[##{Process.pid}] processed jobs: #{processed_count}."
+              RJ.logger.info "rj_worker[##{Process.pid}] stopped."
+              # RJ.logger.close
+              # exit!
             end
           }
 
-          queues.each do |routing_key|
-            queue = AMQP.channel.queue(RJ.config.queue_name(routing_key), RJ.config[:queues][routing_key])
-
-            RJ.logger.info "Worker ##{Process.pid} <= #{RJ.config.queue_name(routing_key)}"
-
-            explicit_ack = !!RJ.config[:queues][routing_key][:ack]
-
-            queue.subscribe(ack: explicit_ack) do |metadata, payload|
-              @job = RJ::Job.parse(payload)
+          AmqpHelper.prepare_channel
 
-              if @job == :not_found
-                metadata.ack if explicit_ack
-              else
-                if @job.expired?
-                  RJ.logger.info "Job expired: #{@job.inspect}"
+          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 "rj_worker[##{Process.pid}] subscribed to #{RJ.config.queue_name(routing_key)} (#{declare_ok.to_i + 1})"
+
+              explicit_ack = !!RJ.config[:queues][routing_key][:ack]
+
+              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
-                  @job.run_perform
-                  processed_count += 1
+                  if @job.expired?
+                    RJ.logger.warn "rj_worker[##{Process.pid}] Job expired: #{@job.to_ruby_string}"
+                  else
+                    @job.run_perform
+                    processed_count += 1
+                  end
+
+                  metadata.ack if explicit_ack
                 end
 
-                metadata.ack if explicit_ack
+                check_shutdown.call
               end
-
-              check_shutdown.call
-            end
+            }
           end
 
           if time > 0
@@ -95,6 +94,8 @@ module RabbitJobs
           EM.add_periodic_timer(1) do
             check_shutdown.call
           end
+
+          RJ.logger.info "rj_worker[##{Process.pid}] started."
         end
       rescue
         error = $!
@@ -125,6 +126,8 @@ module RabbitJobs
         Process.daemon(true)
       end
 
+      count = RJ._run_after_fork_callbacks
+
       self.worker_pid ||= Process.pid
 
       if self.pidfile

data/rabbit_jobs.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = ""
   gem.date          = Time.now.strftime('%Y-%m-%d')
 
-  gem.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  gem.executables   = %w(rj_worker rj_scheduler)
   gem.files         = `git ls-files`.split("\n")
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = "rabbit_jobs"
@@ -20,4 +20,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency "amqp", "~> 0.9"
   gem.add_dependency "rake"
   gem.add_dependency "rufus-scheduler", "~> 2.0"
+  gem.add_dependency "rails", ">= 3.0"
 end

data/spec/integration/publisher_spec.rb

@@ -7,42 +7,55 @@ describe RabbitJobs::Publisher do
 
   before(:each) do
     RabbitJobs.configure do |c|
-      c.url 'amqp://localhost'
+      c.server 'amqp://localhost/'
       c.queue 'rspec_queue'
       c.queue 'rspec_queue2'
       c.queue 'rspec_queue3'
     end
 
-    RabbitJobs::Publisher.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3)
+    RJ.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3)
   end
 
   it 'should publish message to queue' do
-    RabbitJobs.publish(TestJob, 'some', 'other', 'params')
-    RabbitJobs::Publisher.purge_queue('rspec_queue').should == 1
+    RJ.publish(TestJob, 'some', 'other', 'params')
+    RJ.purge_queue('rspec_queue').should == 1
   end
 
   it 'should accept symbol as queue name' do
-    RabbitJobs.publish_to(:rspec_queue, TestJob)
-    RabbitJobs::Publisher.purge_queue('rspec_queue').should == 1
+    RJ.publish_to(:rspec_queue, TestJob)
+    RJ.purge_queue('rspec_queue').should == 1
   end
 
   it 'purge_queue should accept many queues' do
-    RabbitJobs.publish_to(:rspec_queue, TestJob)
-    RabbitJobs.publish_to(:rspec_queue2, TestJob)
-    RabbitJobs.publish_to(:rspec_queue3, TestJob)
-    RabbitJobs::Publisher.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3).should == 3
+    RJ.publish_to(:rspec_queue, TestJob)
+    RJ.publish_to(:rspec_queue2, TestJob)
+    RJ.publish_to(:rspec_queue3, TestJob)
+    RJ.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3).should == 3
   end
 
   it 'should publish job with *params' do
-    RabbitJobs.publish_to(:rspec_queue, JobWithArgsArray, 'first value', :some_symbol, 123, 'and string')
-    RabbitJobs::Publisher.purge_queue(:rspec_queue).should == 1
+    RJ.publish_to(:rspec_queue, JobWithArgsArray, 'first value', :some_symbol, 123, 'and string')
+    RJ.purge_queue(:rspec_queue).should == 1
   end
 
   it 'should publish 1000 messages in one second' do
+    count = 1000
+    published = 0
     time = Benchmark.measure {
-      1000.times { RabbitJobs.publish_to(:rspec_queue, TestJob) }
+      RJ.run {
+        count.times {
+          RJ.publish_to(:rspec_queue, TestJob) {
+            published += 1
+            if published == count
+              RJ.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3) { |removed|
+                removed.should == 1000
+                RJ.stop
+              }
+            end
+          }
+        }
+      }
     }
-    RabbitJobs::Publisher.purge_queue(:rspec_queue, :rspec_queue2, :rspec_queue3).should == 1000
     puts time
   end
 end

data/spec/integration/scheduler_spec.rb

@@ -12,7 +12,7 @@ describe RabbitJobs::Scheduler do
     scheduler.work(10) # work for 1 second
 
     RJ.config.queue 'default', RJ::Configuration::DEFAULT_QUEUE_PARAMS
-    puts "messages queued: " + RabbitJobs::Publisher.purge_queue('default').to_s
-    RabbitJobs::Publisher.purge_queue('default').should == 0
+    puts "messages queued: " + RJ.purge_queue('default').to_s
+    RJ.purge_queue('default').should == 0
   end
 end

data/spec/integration/worker_spec.rb

@@ -10,15 +10,36 @@ describe RabbitJobs::Worker do
       c.queue 'rspec_durable_queue', auto_delete: false, durable: true, ack: true
     end
 
-    RJ::Publisher.purge_queue('rspec_durable_queue')
+    RJ.run {
+      RJ::Publisher.purge_queue('rspec_durable_queue') {
+        count = 5
+        5.times {
+          RabbitJobs.publish(PrintTimeJob, Time.now) {
+            count -= 1
+            if count <= 0
+              Timecop.freeze(Time.now - 4600) {
+                count = 5
+                5.times {
+                  RabbitJobs.publish(JobWithExpire) {
+                    count -= 1
+                    if count <= 0
+                      RabbitJobs.publish(JobWithErrorHook) {
+                        RJ.stop
+                      }
+                    end
+                  }
+                }
+              }
+            end
+          }
+        }
+      }
+    }
 
-    5.times { RabbitJobs.publish(PrintTimeJob, Time.now) }
-    Timecop.freeze(Time.now - 4600) { 5.times { RabbitJobs.publish(JobWithExpire) } }
-    1.times { RabbitJobs.publish(JobWithErrorHook) }
     worker = RabbitJobs::Worker.new
 
     worker.work(1) # work for 1 second
-    RJ::Publisher.purge_queue('rspec_durable_queue')
+    RJ.run { RJ::Publisher.purge_queue('rspec_durable_queue') { RJ.stop } }
   end
 
   it 'should allow to publish jobs from worker' do
@@ -27,9 +48,14 @@ describe RabbitJobs::Worker do
       c.queue 'rspec_durable_queue', auto_delete: false, durable: true, ack: true
     end
 
-    RJ::Publisher.purge_queue('rspec_durable_queue')
+    RJ.run {
+      RJ::Publisher.purge_queue('rspec_durable_queue') {
+        RabbitJobs.publish(JobWithPublish) {
+          RJ.stop
+        }
+      }
+    }
 
-    RabbitJobs.publish(JobWithPublish)
     worker = RabbitJobs::Worker.new
 
     worker.work(1) # work for 1 second

data/spec/unit/configuration_spec.rb

@@ -59,7 +59,7 @@ describe RabbitJobs::Configuration do
   it 'use default config' do
     RabbitJobs.config.to_hash.should == {
       error_log: true,
-      url: "amqp://localhost",
+      url: "amqp://localhost/",
       prefix: "rabbit_jobs",
       queues: {
         "default" => {
@@ -73,7 +73,7 @@ describe RabbitJobs::Configuration do
 
   it 'returns settings on some methods' do
     RabbitJobs.config.error_log == true
-    RabbitJobs.config.url.should == 'amqp://localhost'
+    RabbitJobs.config.servers.should == ['amqp://localhost/']
     RabbitJobs.config.routing_keys.should == []
     RabbitJobs.config.prefix.should == 'rabbit_jobs'
     RabbitJobs.config.queue_name('default').should == 'rabbit_jobs#default'

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.2.0.pre4
-  prerelease: 6
+  version: '0.3'
+  prerelease: 
 platform: ruby
 authors:
 - Pavel Lazureykis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-08 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &16470020 !ruby/object:Gem::Requirement
+  requirement: &16813080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *16470020
+  version_requirements: *16813080
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16499220 !ruby/object:Gem::Requirement
+  requirement: &16811500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16499220
+  version_requirements: *16811500
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &16496980 !ruby/object:Gem::Requirement
+  requirement: &16809880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,11 +43,24 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16496980
+  version_requirements: *16809880
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &16808180 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *16808180
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
-executables: []
+executables:
+- rj_worker
+- rj_scheduler
 extensions: []
 extra_rdoc_files: []
 files:
@@ -57,7 +70,11 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/rj_scheduler
+- bin/rj_worker
+- examples/client
 - examples/configuration.rb
+- examples/worker
 - lib/rabbit_jobs.rb
 - lib/rabbit_jobs/amqp_helper.rb
 - lib/rabbit_jobs/configuration.rb
@@ -98,13 +115,16 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2644135263764461757
+      hash: -3349151042287683745
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
+      segments:
+      - 0
+      hash: -3349151042287683745
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11