euston-rabbitmq 1.2.0-java → 1.2.1-java

Sign up to get free protection for your applications and to get access to all the features.
Files changed (4) hide show
  1. data/euston-rabbitmq.gemspec +3 -3
  2. data/lib/euston-rabbitmq/euston/retrying_subscription.rb +3 -5
  3. data/lib/euston-rabbitmq/version.rb +1 -1
  4. metadata +28 -28
data/euston-rabbitmq.gemspec CHANGED
@@ -1,6 +1,6 @@
1
1
  Gem::Specification.new do |s|
2
2
  s.name = 'euston-rabbitmq'
3
- s.version = '1.2.0'
3
+ s.version = '1.2.1'
4
4
  s.platform = RUBY_PLATFORM.to_s == 'java' ? 'java' : Gem::Platform::RUBY
5
5
  s.authors = ['Lee Henson', 'Guy Boertje']
6
6
  s.email = ['lee.m.henson@gmail.com', 'guyboertje@gmail.com']
@@ -44,12 +44,12 @@ Gem::Specification.new do |s|
44
44
  s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
45
45
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
46
46
 
47
- s.add_dependency 'activesupport', '~> 3.0.10'
47
+ s.add_dependency 'activesupport', '>= 3.0.10'
48
48
  s.add_dependency 'euston', '~> 1.2.0'
49
49
  s.add_dependency 'euston-eventstore', '~> 1.2.0'
50
50
  s.add_dependency 'hash-keys', '~> 1.0.0'
51
51
  s.add_dependency 'hollywood', '~> 1.0.0'
52
- s.add_dependency 'i18n', '~> 0.5.0'
52
+ s.add_dependency 'i18n', '>= 0.5.0'
53
53
  s.add_dependency 'hot_bunnies', '~> 1.3.0.pre1' if RUBY_PLATFORM.to_s == 'java'
54
54
  s.add_dependency 'safely', '~> 0.3.0'
55
55
 
data/lib/euston-rabbitmq/euston/retrying_subscription.rb CHANGED
@@ -46,12 +46,14 @@ module Euston
46
46
  end
47
47
 
48
48
  def handle_failure message, error, reactive_message
49
+ return reactive_message.reject if error.is_a? Euston::EventStore::ConcurrencyError
50
+
49
51
  failures = message[:failures] || 0
50
52
  failures = failures + 1
51
53
  message[:failures] = failures
52
54
 
53
55
  begin
54
- if failures == 3
56
+ if failures == 5
55
57
  debug_message = "Message failed, out of retries"
56
58
 
57
59
  message.delete :failures
@@ -61,7 +63,6 @@ module Euston
61
63
  exchange = :events
62
64
  else
63
65
  debug_message = "Message failed, retrying"
64
-
65
66
  options = { :routing_key => reactive_message.headers.routing_key }
66
67
  exchange = reactive_message.headers.routing_key.split('.').first.to_sym
67
68
  end
@@ -69,9 +70,6 @@ module Euston
69
70
  options = default_publish_options.merge options
70
71
  exchange = get_exchange @channel, exchange
71
72
  message = ActiveSupport::JSON.encode message
72
-
73
- @log.debug "#{debug_message}: #{message}"
74
-
75
73
  exchange.publish message, options
76
74
 
77
75
  reactive_message.ack
data/lib/euston-rabbitmq/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Euston
2
2
  module RabbitMq
3
- VERSION = "1.2.0"
3
+ VERSION = "1.2.1"
4
4
  end
5
5
  end
metadata CHANGED
@@ -2,7 +2,7 @@
2
2
  name: euston-rabbitmq
3
3
  version: !ruby/object:Gem::Version
4
4
  prerelease:
5
- version: 1.2.0
5
+ version: 1.2.1
6
6
  platform: java
7
7
  authors:
8
8
  - Lee Henson
@@ -10,139 +10,139 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2011-10-12 00:00:00.000000000 +01:00
13
+ date: 2011-10-18 00:00:00.000000000 +01:00
14
14
  default_executable:
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: activesupport
18
- version_requirements: &2210 !ruby/object:Gem::Requirement
18
+ version_requirements: &2230 !ruby/object:Gem::Requirement
19
19
  requirements:
20
- - - ~>
20
+ - - ! '>='
21
21
  - !ruby/object:Gem::Version
22
22
  version: 3.0.10
23
23
  none: false
24
- requirement: *2210
24
+ requirement: *2230
25
25
  prerelease: false
26
26
  type: :runtime
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: euston
29
- version_requirements: &2228 !ruby/object:Gem::Requirement
29
+ version_requirements: &2248 !ruby/object:Gem::Requirement
30
30
  requirements:
31
31
  - - ~>
32
32
  - !ruby/object:Gem::Version
33
33
  version: 1.2.0
34
34
  none: false
35
- requirement: *2228
35
+ requirement: *2248
36
36
  prerelease: false
37
37
  type: :runtime
38
38
  - !ruby/object:Gem::Dependency
39
39
  name: euston-eventstore
40
- version_requirements: &2244 !ruby/object:Gem::Requirement
40
+ version_requirements: &2264 !ruby/object:Gem::Requirement
41
41
  requirements:
42
42
  - - ~>
43
43
  - !ruby/object:Gem::Version
44
44
  version: 1.2.0
45
45
  none: false
46
- requirement: *2244
46
+ requirement: *2264
47
47
  prerelease: false
48
48
  type: :runtime
49
49
  - !ruby/object:Gem::Dependency
50
50
  name: hash-keys
51
- version_requirements: &2260 !ruby/object:Gem::Requirement
51
+ version_requirements: &2280 !ruby/object:Gem::Requirement
52
52
  requirements:
53
53
  - - ~>
54
54
  - !ruby/object:Gem::Version
55
55
  version: 1.0.0
56
56
  none: false
57
- requirement: *2260
57
+ requirement: *2280
58
58
  prerelease: false
59
59
  type: :runtime
60
60
  - !ruby/object:Gem::Dependency
61
61
  name: hollywood
62
- version_requirements: &2276 !ruby/object:Gem::Requirement
62
+ version_requirements: &2296 !ruby/object:Gem::Requirement
63
63
  requirements:
64
64
  - - ~>
65
65
  - !ruby/object:Gem::Version
66
66
  version: 1.0.0
67
67
  none: false
68
- requirement: *2276
68
+ requirement: *2296
69
69
  prerelease: false
70
70
  type: :runtime
71
71
  - !ruby/object:Gem::Dependency
72
72
  name: i18n
73
- version_requirements: &2292 !ruby/object:Gem::Requirement
73
+ version_requirements: &2312 !ruby/object:Gem::Requirement
74
74
  requirements:
75
- - - ~>
75
+ - - ! '>='
76
76
  - !ruby/object:Gem::Version
77
77
  version: 0.5.0
78
78
  none: false
79
- requirement: *2292
79
+ requirement: *2312
80
80
  prerelease: false
81
81
  type: :runtime
82
82
  - !ruby/object:Gem::Dependency
83
83
  name: hot_bunnies
84
- version_requirements: &2308 !ruby/object:Gem::Requirement
84
+ version_requirements: &2328 !ruby/object:Gem::Requirement
85
85
  requirements:
86
86
  - - ~>
87
87
  - !ruby/object:Gem::Version
88
88
  version: 1.3.0.pre1
89
89
  none: false
90
- requirement: *2308
90
+ requirement: *2328
91
91
  prerelease: false
92
92
  type: :runtime
93
93
  - !ruby/object:Gem::Dependency
94
94
  name: safely
95
- version_requirements: &2324 !ruby/object:Gem::Requirement
95
+ version_requirements: &2344 !ruby/object:Gem::Requirement
96
96
  requirements:
97
97
  - - ~>
98
98
  - !ruby/object:Gem::Version
99
99
  version: 0.3.0
100
100
  none: false
101
- requirement: *2324
101
+ requirement: *2344
102
102
  prerelease: false
103
103
  type: :runtime
104
104
  - !ruby/object:Gem::Dependency
105
105
  name: awesome_print
106
- version_requirements: &2340 !ruby/object:Gem::Requirement
106
+ version_requirements: &2360 !ruby/object:Gem::Requirement
107
107
  requirements:
108
108
  - - ~>
109
109
  - !ruby/object:Gem::Version
110
110
  version: 0.4.0
111
111
  none: false
112
- requirement: *2340
112
+ requirement: *2360
113
113
  prerelease: false
114
114
  type: :development
115
115
  - !ruby/object:Gem::Dependency
116
116
  name: fuubar
117
- version_requirements: &2358 !ruby/object:Gem::Requirement
117
+ version_requirements: &2378 !ruby/object:Gem::Requirement
118
118
  requirements:
119
119
  - - ~>
120
120
  - !ruby/object:Gem::Version
121
121
  version: 0.0.0
122
122
  none: false
123
- requirement: *2358
123
+ requirement: *2378
124
124
  prerelease: false
125
125
  type: :development
126
126
  - !ruby/object:Gem::Dependency
127
127
  name: rabbitmqadmin-cli
128
- version_requirements: &2374 !ruby/object:Gem::Requirement
128
+ version_requirements: &2394 !ruby/object:Gem::Requirement
129
129
  requirements:
130
130
  - - ~>
131
131
  - !ruby/object:Gem::Version
132
132
  version: 1.0.0
133
133
  none: false
134
- requirement: *2374
134
+ requirement: *2394
135
135
  prerelease: false
136
136
  type: :development
137
137
  - !ruby/object:Gem::Dependency
138
138
  name: rspec
139
- version_requirements: &2390 !ruby/object:Gem::Requirement
139
+ version_requirements: &2410 !ruby/object:Gem::Requirement
140
140
  requirements:
141
141
  - - ~>
142
142
  - !ruby/object:Gem::Version
143
143
  version: 2.6.0
144
144
  none: false
145
- requirement: *2390
145
+ requirement: *2410
146
146
  prerelease: false
147
147
  type: :development
148
148
  description: JRuby RabbitMq bindings