sensu 0.19.0 → 0.19.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5ee04199edcbc505d8c7e2ed40c0b54d51e64bb
-  data.tar.gz: d33375857eedab057e880d5290eeaa4297afcf31
+  metadata.gz: 1dc75243d46b5c3d1a4e7637c39fe599af1a0268
+  data.tar.gz: bed404c945a267f021355d040bcfec5f87e3fbab
 SHA512:
-  metadata.gz: d1a7215833689473b54342e8c50e04e858e191c9b51013acbf4c0568d25ef37f77f892d5dd70db6d9e0976cc2ec1ffaac0e320172261a1b974120d3d80bf5b37
-  data.tar.gz: b6565070286c64b9c9d5deaf0c253964538a0a8fafaa70e225ce2eb6cc9a9cdbd68522201709d54206625b77617037e67dd8beedacad44439626eccf0a8307cb
+  metadata.gz: d1dec9e79a91f97c7e02ee9b942c608b79ff293cca5a7e6191794dda8a29c1786f9e4d254410785056a3b271e581155f8b3926d649002a87c8b6790c41a9674a
+  data.tar.gz: 29c9a642beeeb53070890f088aaabb931795b24b6b034f7b015a4d3ea16e303e4433dc9fc363cde273dac2ad137ba7f1b5c84ea34ce7c324755d2a506762eee9

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+## 0.19.1 - 2015-06-04
+
+### Other
+
+Now using an EventMachine timer for the TCP handler connection timeout, as
+`pending_connect_timeout()` and `comm_inactivity_timeout()` are not
+currently supported on all platforms.
+
+Updated Thin and UUID tools to the latest versions, which include
+improvements and bug fixes.
+
 ## 0.19.0 - 2015-06-01
 
 ### Features

data/lib/sensu/api/process.rb

@@ -4,7 +4,7 @@ gem "sinatra", "1.4.6"
 gem "async_sinatra", "1.2.0"
 
 unless RUBY_PLATFORM =~ /java/
-  gem "thin", "1.5.0"
+  gem "thin", "1.6.3"
   require "thin"
 end
 

data/lib/sensu/constants.rb

@@ -1,7 +1,7 @@
 module Sensu
   unless defined?(Sensu::VERSION)
     # Sensu release version.
-    VERSION = "0.19.0"
+    VERSION = "0.19.1"
 
     # Sensu check severities.
     SEVERITIES = %w[ok warning critical unknown]

data/lib/sensu/daemon.rb

@@ -2,7 +2,7 @@ require "rubygems"
 
 gem "multi_json", "1.11.0"
 
-gem "sensu-em", "2.5.0"
+gem "sensu-em", "2.5.1"
 gem "sensu-logger", "1.0.0"
 gem "sensu-settings", "1.9.0"
 gem "sensu-extension", "1.1.2"

data/lib/sensu/server/handle.rb

@@ -61,8 +61,7 @@ module Sensu
             end
             socket.on_error = on_error
             timeout = handler[:timeout] || 10
-            socket.pending_connect_timeout = timeout
-            socket.comm_inactivity_timeout = timeout
+            socket.set_timeout(timeout)
             socket.send_data(event_data.to_s)
             socket.close_connection_after_writing
           end

data/lib/sensu/server/socket.rb

@@ -10,26 +10,38 @@ module Sensu
       # @return [Proc] callback to be called when there is an error.
       attr_accessor :on_error
 
-      # Record the current time and the inactivity timeout value, when
-      # the socket connection is successful. These values are used to
-      # determine if the a connection was closed due to the timeout.
+      # Create a timeout timer to immediately close the socket
+      # connection and set `@timed_out` to true to indicate that the
+      # timeout caused the connection to close. The timeout timer is
+      # stored with `@timeout_timer`, so that it can be cancelled when
+      # the connection is closed.
+      #
+      # @param timeout [Numeric] in seconds.
+      def set_timeout(timeout)
+        @timeout_timer = EM::Timer.new(timeout) do
+          @timed_out = true
+          close_connection
+        end
+      end
+
+      # Record the current time when connected.
       def connection_completed
         @connected_at = Time.now.to_f
-        @inactivity_timeout = comm_inactivity_timeout
       end
 
       # Determine if the connection and data transmission was
       # successful and call the appropriate callback, `@on_success`
-      # or `@on_error`, providing it with a message. The
+      # or `@on_error`, providing it with a message. Cancel the
+      # connection timeout timer `@timeout_timer`, if it is set. The
       # `@connected_at` timestamp indicates that the connection was
-      # successful. If the elapsed time is greater than the inactivity
-      # timeout value, the connection was closed abruptly by the
-      # timeout timer, and the data was not transmitted.
+      # successful. If `@timed_out` is true, the connection was closed
+      # by the connection timeout, and the data is assumed to not have
+      # been transmitted.
       def unbind
+        @timeout_timer.cancel if @timeout_timer
         if @connected_at
-          elapsed_time = Time.now.to_f - @connected_at
-          if elapsed_time >= @inactivity_timeout
-            @on_error.call("socket inactivity timeout")
+          if @timed_out
+            @on_error.call("socket timeout")
           else
             @on_success.call("wrote to socket")
           end

data/lib/sensu/utilities.rb

@@ -1,4 +1,4 @@
-gem "uuidtools", "2.1.4"
+gem "uuidtools", "2.1.5"
 
 require "uuidtools"
 

data/sensu.gemspec

@@ -15,9 +15,9 @@ Gem::Specification.new do |s|
 
   s.add_dependency "json" if RUBY_VERSION < "1.9"
   s.add_dependency "multi_json", "1.11.0"
-  s.add_dependency "uuidtools", "2.1.4"
+  s.add_dependency "uuidtools", "2.1.5"
   s.add_dependency "eventmachine", "1.0.3"
-  s.add_dependency "sensu-em", "2.5.0"
+  s.add_dependency "sensu-em", "2.5.1"
   s.add_dependency "sensu-logger", "1.0.0"
   s.add_dependency "sensu-settings", "1.9.0"
   s.add_dependency "sensu-extension", "1.1.2"
@@ -27,7 +27,7 @@ Gem::Specification.new do |s|
   s.add_dependency "em-redis-unified", "1.0.0"
   s.add_dependency "sinatra", "1.4.6"
   s.add_dependency "async_sinatra", "1.2.0"
-  s.add_dependency "thin", "1.5.0" unless RUBY_PLATFORM =~ /java/
+  s.add_dependency "thin", "1.6.3" unless RUBY_PLATFORM =~ /java/
 
   s.add_development_dependency "rake", "~> 10.3"
   s.add_development_dependency "rspec", "~> 3.0.0"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sensu
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.19.1
 platform: ruby
 authors:
 - Sean Porter
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-02 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multi_json
@@ -31,14 +31,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.5
 - !ruby/object:Gem::Dependency
   name: eventmachine
   requirement: !ruby/object:Gem::Requirement
@@ -59,14 +59,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: sensu-logger
   requirement: !ruby/object:Gem::Requirement
@@ -199,14 +199,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -307,3 +307,4 @@ signing_key:
 specification_version: 4
 summary: A monitoring framework
 test_files: []
+has_rdoc: false