rabbit_jobs 0.1.8.1 → 0.1.8.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. data/lib/rabbit_jobs/configuration.rb +3 -3
  2. data/lib/rabbit_jobs/scheduler.rb +5 -3
  3. data/lib/rabbit_jobs/version.rb +1 -1
  4. metadata +15 -9
data/lib/rabbit_jobs/configuration.rb CHANGED
@@ -14,9 +14,9 @@ module RabbitJobs
14
14
  @@configuration ||= load_config
15
15
  end
16
16
 
17
- def load_config
18
- if defined?(Rails) && Rails.respond_to?(:root)
19
- config_file = Rails.root.join('config/rabbit_jobs.yml')
17
+ def load_config(config_file = nil)
18
+ config_file ||= defined?(Rails) && Rails.respond_to?(:root) && Rails.root.join('config/rabbit_jobs.yml')
19
+ if config_file
20
20
  if File.exists?(config_file)
21
21
  @@configuration ||= Configuration.new
22
22
  @@configuration.load_file(config_file)
data/lib/rabbit_jobs/scheduler.rb CHANGED
@@ -8,7 +8,7 @@ module RabbitJobs
8
8
  class Scheduler
9
9
  include AmqpHelpers
10
10
 
11
- attr_accessor :pidfile, :background, :schedule
11
+ attr_accessor :pidfile, :background, :schedule, :process_name
12
12
 
13
13
  def load_default_schedule
14
14
  if defined?(Rails)
@@ -61,10 +61,10 @@ module RabbitJobs
61
61
  args = config['args'] || config[:args] || []
62
62
  klass_name = config['class'] || config[:class]
63
63
  params = args.is_a?(Hash) ? [args] : Array(args)
64
- queue = config['queue'] || config[:queue] || RabbitJobs.config.routing_keys.first
64
+ queue = config['queue'] || config[:queue] || RJ.config.routing_keys.first
65
65
 
66
66
  RJ.logger.info "publishing #{config} at #{Time.now}"
67
- RabbitJobs.publish_to(queue, klass_name, *params)
67
+ RJ.publish_to(queue, klass_name, *params)
68
68
  rescue
69
69
  RJ.logger.warn "Failed to publish #{klass_name}:\n #{$!}\n params = #{params.inspect}"
70
70
  end
@@ -85,6 +85,8 @@ module RabbitJobs
85
85
  def work(time = 0)
86
86
  startup
87
87
 
88
+ $0 = self.process_name || "rj_scheduler"
89
+
88
90
  processed_count = 0
89
91
  amqp_with_exchange do |connection, exchange|
90
92
  load_schedule!
data/lib/rabbit_jobs/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module RabbitJobs
2
- VERSION = "0.1.8.1"
2
+ VERSION = "0.1.8.2"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rabbit_jobs
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.8.1
4
+ version: 0.1.8.2
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2012-05-05 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: amqp
16
- requirement: &70276101782900 !ruby/object:Gem::Requirement
16
+ requirement: &70350675513600 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0.9'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70276101782900
24
+ version_requirements: *70350675513600
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: bunny
27
- requirement: &70276101782320 !ruby/object:Gem::Requirement
27
+ requirement: &70350675512820 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ~>
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0.7'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70276101782320
35
+ version_requirements: *70350675512820
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rake
38
- requirement: &70276101781640 !ruby/object:Gem::Requirement
38
+ requirement: &70350675489860 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70276101781640
46
+ version_requirements: *70350675489860
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rufus-scheduler
49
- requirement: &70276101780620 !ruby/object:Gem::Requirement
49
+ requirement: &70350675488680 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ~>
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '2.0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70276101780620
57
+ version_requirements: *70350675488680
58
58
  description: Background jobs on RabbitMQ
59
59
  email:
60
60
  - lazureykis@gmail.com
@@ -106,12 +106,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
106
106
  - - ! '>='
107
107
  - !ruby/object:Gem::Version
108
108
  version: '0'
109
+ segments:
110
+ - 0
111
+ hash: 111001831721435723
109
112
  required_rubygems_version: !ruby/object:Gem::Requirement
110
113
  none: false
111
114
  requirements:
112
115
  - - ! '>='
113
116
  - !ruby/object:Gem::Version
114
117
  version: '0'
118
+ segments:
119
+ - 0
120
+ hash: 111001831721435723
115
121
  requirements: []
116
122
  rubyforge_project:
117
123
  rubygems_version: 1.8.15