rabbit_jobs 0.1.8.1 → 0.1.8.2

data/lib/rabbit_jobs/configuration.rb

@@ -14,9 +14,9 @@ module RabbitJobs
     @@configuration ||= load_config
   end
 
-  def load_config
-    if defined?(Rails) && Rails.respond_to?(:root)
-      config_file = Rails.root.join('config/rabbit_jobs.yml')
+  def load_config(config_file = nil)
+    config_file ||= defined?(Rails) && Rails.respond_to?(:root) && Rails.root.join('config/rabbit_jobs.yml')
+    if config_file
       if File.exists?(config_file)
         @@configuration ||= Configuration.new
         @@configuration.load_file(config_file)

data/lib/rabbit_jobs/scheduler.rb

@@ -8,7 +8,7 @@ module RabbitJobs
   class Scheduler
     include AmqpHelpers
 
-    attr_accessor :pidfile, :background, :schedule
+    attr_accessor :pidfile, :background, :schedule, :process_name
 
     def load_default_schedule
       if defined?(Rails)
@@ -61,10 +61,10 @@ module RabbitJobs
       args = config['args'] || config[:args] || []
       klass_name = config['class'] || config[:class]
       params = args.is_a?(Hash) ? [args] : Array(args)
-      queue = config['queue'] || config[:queue] || RabbitJobs.config.routing_keys.first
+      queue = config['queue'] || config[:queue] || RJ.config.routing_keys.first
 
       RJ.logger.info "publishing #{config} at #{Time.now}"
-      RabbitJobs.publish_to(queue, klass_name, *params)
+      RJ.publish_to(queue, klass_name, *params)
     rescue
       RJ.logger.warn "Failed to publish #{klass_name}:\n #{$!}\n params = #{params.inspect}"
     end
@@ -85,6 +85,8 @@ module RabbitJobs
     def work(time = 0)
       startup
 
+      $0 = self.process_name || "rj_scheduler"
+
       processed_count = 0
       amqp_with_exchange do |connection, exchange|
         load_schedule!

data/lib/rabbit_jobs/version.rb

@@ -1,3 +1,3 @@
 module RabbitJobs
-  VERSION = "0.1.8.1"
+  VERSION = "0.1.8.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rabbit_jobs
 version: !ruby/object:Gem::Version
-  version: 0.1.8.1
+  version: 0.1.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp
-  requirement: &70276101782900 !ruby/object:Gem::Requirement
+  requirement: &70350675513600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *70276101782900
+  version_requirements: *70350675513600
 - !ruby/object:Gem::Dependency
   name: bunny
-  requirement: &70276101782320 !ruby/object:Gem::Requirement
+  requirement: &70350675512820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '0.7'
   type: :runtime
   prerelease: false
-  version_requirements: *70276101782320
+  version_requirements: *70350675512820
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70276101781640 !ruby/object:Gem::Requirement
+  requirement: &70350675489860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70276101781640
+  version_requirements: *70350675489860
 - !ruby/object:Gem::Dependency
   name: rufus-scheduler
-  requirement: &70276101780620 !ruby/object:Gem::Requirement
+  requirement: &70350675488680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,7 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70276101780620
+  version_requirements: *70350675488680
 description: Background jobs on RabbitMQ
 email:
 - lazureykis@gmail.com
@@ -106,12 +106,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 111001831721435723
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 111001831721435723
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15