qswarm 0.0.12 → 0.0.13

Sign up to get free protection for your applications and to get access to all the features.
data/lib/qswarm/broker.rb CHANGED
@@ -54,7 +54,7 @@ module Qswarm
54
54
 
55
55
  def exchange(channel = nil)
56
56
  @exchange ||= begin
57
- @exchange = AMQP::Exchange.new(channel ||= AMQP::Channel.new(connection), @exchange_type, @exchange_name, :durable => @durable) do |exchange|
57
+ @exchange = AMQP::Exchange.new(channel ||= AMQP::Channel.new(connection), @exchange_type, @exchange_name, :durable => @durable, :auto_recovery => true) do |exchange|
58
58
  logger.debug "Declared #{@exchange_type} exchange #{@vhost}/#{@exchange_name}"
59
59
  @exchange.on_return do |basic_return, metadata, payload|
60
60
  logger.error "#{payload} was returned! reply_code = #{basic_return.reply_code}, reply_text = #{basic_return.reply_text}"
@@ -91,18 +91,14 @@ module Qswarm
91
91
  logger.debug "Recovered from AMQP network failure"
92
92
  end
93
93
  @@connection["#{@host}:#{@port}#{@vhost}"].on_connection_interruption do |connection|
94
- # reconnect in 10 seconds, without enforcement
94
+ # reconnect in 10 seconds
95
95
  logger.error "AMQP connection interruption, reconnecting in 10s"
96
96
  connection.reconnect(false, 10)
97
97
  end
98
98
  # Force reconnect on heartbeat loss to cope with our funny firewall issues
99
99
  @@connection["#{@host}:#{@port}#{@vhost}"].on_skipped_heartbeats do |connection, settings|
100
- logger.error "Skipped heartbeats detected, reconnecting in 10s"
101
- connection.reconnect(false, 10)
100
+ logger.error "Skipped heartbeats detected"
102
101
  end
103
- # @@connection["#{@host}:#{@port}#{@vhost}"].on_connection_interruption do |connection|
104
- # logger.error "Connection detected connection interruption"
105
- # end
106
102
  @@connection["#{@host}:#{@port}#{@vhost}"].on_error do |connection, connection_close|
107
103
  logger.error "AMQP connection has been closed. Reply code = #{connection_close.reply_code}, reply text = #{connection_close.reply_text}"
108
104
  if connection_close.reply_code == 320
@@ -1,3 +1,3 @@
1
1
  module Qswarm
2
- VERSION = "0.0.12"
2
+ VERSION = "0.0.13"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: qswarm
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.12
4
+ version: 0.0.13
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-04-19 00:00:00.000000000Z
12
+ date: 2012-04-20 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: eventmachine
16
- requirement: &70270115495420 !ruby/object:Gem::Requirement
16
+ requirement: &70243277281860 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70270115495420
24
+ version_requirements: *70243277281860
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: amqp
27
- requirement: &70270115494440 !ruby/object:Gem::Requirement
27
+ requirement: &70243277281440 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70270115494440
35
+ version_requirements: *70243277281440
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: uuid
38
- requirement: &70270115493220 !ruby/object:Gem::Requirement
38
+ requirement: &70243277281020 !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: *70270115493220
46
+ version_requirements: *70243277281020
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: json
49
- requirement: &70270115491920 !ruby/object:Gem::Requirement
49
+ requirement: &70243277280600 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70270115491920
57
+ version_requirements: *70243277280600
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: andand
60
- requirement: &70270115491000 !ruby/object:Gem::Requirement
60
+ requirement: &70243277280180 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70270115491000
68
+ version_requirements: *70243277280180
69
69
  description: Framework for writing distributed agents hanging off an AMQP message
70
70
  bus
71
71
  email: