sensu 0.19.0-java → 0.19.1-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af7ed093ded7b2e179a55b77105fb778cac0652e
-  data.tar.gz: 30adb16516c80250d745845b08f7dd86cb2339f7
+  metadata.gz: 9090016c767406f29e1f3580850f4361c5b1f55f
+  data.tar.gz: 2c0424c86607bf6a1fccb19c7f493c68dc75937f
 SHA512:
-  metadata.gz: 67e3651ad75c33fea8d6e683a552cfa9cdfadedc0a33850d818640f40af4c958020f2878382a0de2063f622d33b5189f60440c47f42051131df68b66edbc6e03
-  data.tar.gz: 61e889d1eb3767d4ff3b727e24980cf34f2c7ac033352bb3ecbc8aacf55f49cdceba43b11a04ecfab1e31e650f2910cae46a778586eb4c4b471abb1f010b18bd
+  metadata.gz: a81971aa8613203a0aec89906bffd3cf301db9c9448326c361b0869afff9762812d6db43c51f282fdb53cc31712d02d63f93b14b5d6d7e1ac2a604927b393c62
+  data.tar.gz: 83aec706451de5300dbe3cf979caa2a39140138b59de61f2d1414c3dae577531d60360902d2926da53dfb88114030dcb89394e58f6b232452853a8f6e4451bcc

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: java
 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
   requirement: !ruby/object:Gem::Requirement
@@ -30,7 +30,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.5
   name: uuidtools
   prerelease: false
   type: :runtime
@@ -38,7 +38,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: 2.1.5
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
   name: sensu-em
   prerelease: false
   type: :runtime
@@ -66,7 +66,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.5.1
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: