rabbit_jobs 0.1.12 → 0.1.13

data/lib/rabbit_jobs/configuration.rb

@@ -15,6 +15,8 @@ module RabbitJobs
   end
 
   def load_config(config_file = nil)
+    @@configuration ||= nil
+
     config_file ||= defined?(Rails) && Rails.respond_to?(:root) && Rails.root.join('config/rabbit_jobs.yml')
     if config_file
       if File.exists?(config_file)
@@ -27,7 +29,6 @@ module RabbitJobs
       self.configure do |c|
         c.url 'amqp://localhost/'
         c.exchange 'rabbit_jobs', auto_delete: false, durable: true
-        c.queue 'default', auto_delete: false, ack: true, durable: true
       end
     end
 

data/lib/rabbit_jobs/job.rb

@@ -25,11 +25,8 @@ module RabbitJobs::Job
       else
         $0 = "##{@child_pid} #{self.class}.perform(#{ params.map(&:inspect).join(', ') }) #{$0}"
         begin
-          if defined?(ActiveRecord::Base)
-            ActiveRecord::Base.establish_connection
-          end
-          if defined?(MongoMapper)
-            MongoMapper.database.connection.connect_to_master
+          RJ.__after_fork_callbacks.each do |callback|
+            callback.call()
           end
 
           self.class.perform(*params)

data/lib/rabbit_jobs/publisher.rb

@@ -12,6 +12,7 @@ module RabbitJobs
     extend AmqpHelpers
 
     def publish(klass, *params)
+      RJ.config.queue('default', RJ::Configuration::DEFAULT_QUEUE_PARAMS) if RJ.config.routing_keys.empty?
       key = RJ.config.routing_keys.first
       publish_to(key, klass, *params)
     end

data/lib/rabbit_jobs/tasks.rb

@@ -8,7 +8,7 @@ namespace :rj do
   def initialize_rj_daemon(daemon)
     daemon.pidfile = ENV['PIDFILE']
     daemon.background = %w(yes true).include? ENV['BACKGROUND']
-    RJ.logger = ::Logger.new(ENV['LOGFILE']) if ENV['LOGFILE']
+    RJ.logger = ::Logger.new(ENV['LOGFILE'] || $stdout)
     RJ.logger.level = ENV['VERBOSE'] ? Logger::INFO : Logger::WARN
 
     daemon

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.12"
+  VERSION = "0.1.13"
 end

data/lib/rabbit_jobs/worker.rb

@@ -108,13 +108,6 @@ 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/lib/rabbit_jobs.rb

@@ -30,6 +30,17 @@ module RabbitJobs
   def logger
     @logger ||= Logger.new $stdout
   end
+
+  def after_fork(&block)
+    raise ArgumentError.new("No block passed to after_fork") unless block_given?
+    @@after_fork_callbacks ||= []
+
+    @@after_fork_callbacks << block
+  end
+
+  def __after_fork_callbacks
+    @@after_fork_callbacks ||= []
+  end
 end
 
 RJ = RabbitJobs

data/spec/integration/scheduler_spec.rb

@@ -11,6 +11,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
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-28 00:00:00.000000000 Z
+date: 2012-06-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
@@ -129,7 +129,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2915034037780262995
+      hash: 1322251184713494268
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2915034037780262995
+      hash: 1322251184713494268
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24