scout_agent 3.2.1 → 3.2.2

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 3.2.2
+
+* Fixed a bug where older versions of the standard timeout library could kill
+  the lifeline monitoring process
+
 == 3.2.1
 
 * Fixed a bug where log shifting failures could cause the agent to crash

data/lib/scout_agent/core_extensions.rb

@@ -151,6 +151,14 @@ module ScoutAgent
 
     # Module extensions for Process.
     module ProcessModule
+      # 
+      # The error used to halt blocks in the loaded version of the Timeout
+      # library.
+      # 
+      TimeoutStopError = Timeout.const_defined?(:ExitException) ?
+                           Timeout::ExitException               :
+                           Timeout::Error
+      
       # 
       # A convenience method to ensure +child_pid+ is stopped.  First a friendly
       # +TERM+ signal is sent.  Then, after +pause+ seconds, +KILL+ will be sent
@@ -169,9 +177,9 @@ module ScoutAgent
             begin
               Timeout.timeout(pause) {
                 begin
-                  return ::Process.wait2(child_pid).last      # signal response
-                rescue Exception => error                     # no such child
-                  raise if error.is_a? Timeout::ExitException # reraise timeouts
+                  return ::Process.wait2(child_pid).last  # signal response
+                rescue Exception => error                 # no such child
+                  raise if error.is_a? TimeoutStopError   # reraise timeouts
                   return nil # we have already caught the child
                 end
               }

data/lib/scout_agent.rb

@@ -92,7 +92,7 @@ module ScoutAgent
   end
 
   # The version of this agent.
-  VERSION = "3.2.1".freeze
+  VERSION = "3.2.2".freeze
   # A Pathname reference to the agent code directory, used in dynamic loading.
   LIB_DIR = Pathname.new(File.dirname(__FILE__)) + agent_name
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout_agent
 version: !ruby/object:Gem::Version 
-  version: 3.2.1
+  version: 3.2.2
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-26 00:00:00 -05:00
+date: 2009-05-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency