sensu-transport 3.0.0 → 3.2.0

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 517c32e4f19a39830cf6063c9ad922367c150606
4
- data.tar.gz: 11096746935854892ef77ecac01e4e308e48808e
3
+ metadata.gz: 03a8f7bbdd3e6a25407979b0f6ef0f800a161dc8
4
+ data.tar.gz: ff23164ed476e0a860fc1925ca5fd2e254f6307b
5
5
  SHA512:
6
- metadata.gz: bc8457b82d63f770d8ff504f924dbc9b624ea455420bdd5ed2cce8f666c9923ad49b4a53738869fdb331fb2be9c9569afb99fe5b44cbbbbfaad1b7609cd1fbf6
7
- data.tar.gz: c30aefec4551ca98e5ca73ffc519e4afdaed37a91e8359691d4439c046651a75e25bb3d056d14ce46730aff30f69b6274e33833e3413647a9e60726e91036131
6
+ metadata.gz: e4043d48e2c72a4639288f40127fc7cae3aa96df7a8b17ffd7d54f4959efb16ad345255549d95b2eaf533c5d6e3d62c53b5ded38e8024fa1963b88cebfef334e
7
+ data.tar.gz: 59fbf50499d6e30df11af1f656405e6a43a054d7c33ecf7e6eaf489d3636a2fd804a6625b56262f75eb400e9bbb18e7cdd24732f806ea580382d329e4e107e88
data/.travis.yml CHANGED
@@ -1,3 +1,4 @@
1
+ sudo: false
1
2
  language: ruby
2
3
  rvm:
3
4
  - 1.8.7
@@ -0,0 +1,15 @@
1
+ module AMQP
2
+ class Session
3
+ def send_heartbeat
4
+ if tcp_connection_established? && !reconnecting?
5
+ send_frame(AMQ::Protocol::HeartbeatFrame)
6
+ if !@handling_skipped_heartbeats && @last_server_heartbeat
7
+ if @last_server_heartbeat < (Time.now - (self.heartbeat_interval * 2))
8
+ logger.error("[amqp] Detected missing amqp heartbeats")
9
+ self.handle_skipped_heartbeats
10
+ end
11
+ end
12
+ end
13
+ end
14
+ end
15
+ end
@@ -3,6 +3,7 @@ gem "amqp", "1.5.0"
3
3
  require "amqp"
4
4
 
5
5
  require File.join(File.dirname(__FILE__), "base")
6
+ require File.join(File.dirname(__FILE__), "patches", "amqp")
6
7
 
7
8
  module Sensu
8
9
  module Transport
@@ -148,9 +149,12 @@ module Sensu
148
149
  setup_channel(options)
149
150
  end
150
151
 
151
- def periodically_reconnect
152
- timer = EM::PeriodicTimer.new(5) do
152
+ def periodically_reconnect(delay=2)
153
+ capped_delay = (delay >= 20 ? 20 : delay)
154
+ EM::Timer.new(capped_delay) do
153
155
  unless connected?
156
+ reset
157
+ periodically_reconnect(capped_delay += 2)
154
158
  begin
155
159
  connect_with_eligible_options do
156
160
  @reconnecting = false
@@ -159,8 +163,6 @@ module Sensu
159
163
  rescue EventMachine::ConnectionError
160
164
  rescue Java::JavaLang::RuntimeException
161
165
  end
162
- else
163
- timer.cancel
164
166
  end
165
167
  end
166
168
  end
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |spec|
4
4
  spec.name = "sensu-transport"
5
- spec.version = "3.0.0"
5
+ spec.version = "3.2.0"
6
6
  spec.authors = ["Sean Porter"]
7
7
  spec.email = ["portertech@gmail.com"]
8
8
  spec.summary = "The Sensu transport abstraction library"
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sensu-transport
3
3
  version: !ruby/object:Gem::Version
4
- version: 3.0.0
4
+ version: 3.2.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Sean Porter
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-05-20 00:00:00.000000000 Z
11
+ date: 2015-07-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: sensu-em
@@ -123,6 +123,7 @@ files:
123
123
  - Rakefile
124
124
  - lib/sensu/transport.rb
125
125
  - lib/sensu/transport/base.rb
126
+ - lib/sensu/transport/patches/amqp.rb
126
127
  - lib/sensu/transport/rabbitmq.rb
127
128
  - lib/sensu/transport/redis.rb
128
129
  - sensu-transport.gemspec