rabbit_jobs 0.1.10 → 0.1.11

data/examples/configuration.rb

@@ -4,7 +4,7 @@ require 'rabbit_jobs'
 require 'json'
 
 RabbitJobs.configure do |c|
-  c.url        "amqp://localhost"
+  c.url        "amqp://localhost/"
 
   c.exchange 'test_exchange', durable: true, auto_delete: false
 

data/lib/rabbit_jobs/configuration.rb

@@ -25,7 +25,7 @@ module RabbitJobs
 
     unless @@configuration
       self.configure do |c|
-        c.url 'amqp://localhost'
+        c.url 'amqp://localhost/'
         c.exchange 'rabbit_jobs', auto_delete: false, durable: true
         c.queue 'default', auto_delete: false, ack: true, durable: true
       end
@@ -61,7 +61,7 @@ module RabbitJobs
     def initialize
       @data = {
         error_log: true,
-        url: 'amqp://localhost',
+        url: 'amqp://localhost/',
         exchange: 'rabbit_jobs',
         exchange_params: DEFAULT_EXCHANGE_PARAMS,
         queues: {}
@@ -119,7 +119,7 @@ module RabbitJobs
         @data[:url] = value.to_s
         @data[:connection_options] = nil
       else
-        @data[:url] || 'amqp://localhost'
+        @data[:url] || 'amqp://localhost/'
       end
     end
 

data/lib/rabbit_jobs/job.rb

@@ -31,9 +31,8 @@ module RabbitJobs::Job
           if defined?(MongoMapper)
             MongoMapper.database.connection.connect_to_master
           end
-          # RJ.logger.debug 'before perform'
+
           self.class.perform(*params)
-          # RJ.logger.debug 'after perform'
         rescue
           RJ.logger.warn(self.inspect)
           RJ.logger.warn([$!.inspect, $!.backtrace.to_a].join("\n"))

data/lib/rabbit_jobs/publisher.rb

@@ -60,6 +60,7 @@ module RabbitJobs
     def self.with_bunny(&block)
       raise ArgumentError unless block
 
+      # raise RJ.config.connection_options.inspect
       Bunny.run(RJ.config.connection_options.merge({logging: false})) do |bunny|
         block.call(bunny)
       end

data/lib/rabbit_jobs/scheduler.rb

@@ -124,7 +124,16 @@ module RabbitJobs
       # prune_dead_workers
       RabbitJobs::Util.check_pidfile(self.pidfile) if self.pidfile
 
-      Process.daemon(true) if self.background
+      if self.background
+        Process.daemon(true)
+
+        if defined?(ActiveRecord::Base)
+          ActiveRecord::Base.establish_connection
+        end
+        if defined?(MongoMapper)
+          MongoMapper.database.connection.connect_to_master
+        end
+      end
 
       if self.pidfile
         File.open(self.pidfile, 'w') { |f| f << Process.pid }

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/rabbit_jobs/worker.rb

@@ -108,6 +108,13 @@ module RabbitJobs
         else
           # daemonize child process
           Process.daemon(true)
+
+          if defined?(ActiveRecord::Base)
+            ActiveRecord::Base.establish_connection
+          end
+          if defined?(MongoMapper)
+            MongoMapper.database.connection.connect_to_master
+          end
         end
       end
 

data/spec/integration/publisher_spec.rb

@@ -7,6 +7,7 @@ describe RabbitJobs::Publisher do
 
   before(:each) do
     RabbitJobs.configure do |c|
+      c.url 'amqp://localhost/'
       c.exchange 'test'
       c.queue 'rspec_queue'
       c.queue 'rspec_queue2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-10 00:00:00.000000000 Z
+date: 2012-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70306208435960 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70306208435960
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70306208435000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70306208435000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70306208433540 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306208433540
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70306208431520 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +69,12 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70306208431520
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -109,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1920366200643648067
+      hash: -4338471545654317005
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -118,10 +138,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1920366200643648067
+      hash: -4338471545654317005
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Background jobs on RabbitMQ