scout_agent 3.1.8 → 3.1.9

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 3.1.9
+
+* Restoring some error handling code that was accidentally disabled
+* Fixed an issue where the agent could accidentally launch a duplicate process
+* Fixed an issue that prevented the agent from forcing a stop when a process
+  would timeout on a signal response
+
 == 3.1.8
 
 * Switching XMPP default to off until we enable that feature

data/lib/scout_agent/agent.rb

@@ -28,7 +28,7 @@ module ScoutAgent
     
     # Ensure we are the only process with this name running.
     def authorize
-      IDCard.new(file_name).authorize
+      IDCard.new(file_name).authorize or exit(1)
     end
     
     #

data/lib/scout_agent/core_extensions.rb

@@ -169,9 +169,9 @@ module ScoutAgent
             begin
               Timeout.timeout(pause) {
                 begin
-                  return ::Process.wait2(child_pid).last  # response to signal
-                rescue Exception => error                 # no such child
-                  raise if error.is_a? Timeout::Error     # reraise timeouts
+                  return ::Process.wait2(child_pid).last      # signal response
+                rescue Exception => error                     # no such child
+                  raise if error.is_a? Timeout::ExitException # reraise timeouts
                   return nil # we have already caught the child
                 end
               }

data/lib/scout_agent/database.rb

@@ -179,9 +179,9 @@ module ScoutAgent
     rescue Amalgalite::SQLite3::Error => error  # failed to +VACUUM+ database
       log.error("Database maintenance error:  #{error.message}.")
       nil  # maintenance failed, we will try again later
-    # rescue Exception => error  # file locking error
-    #   log.error("Database maintenance locking error:  #{error.message}.")
-    #   nil  # maintenance failed, we will try again later
+    rescue Exception => error  # file locking error
+      log.error("Database maintenance locking error:  #{error.message}.")
+      nil  # maintenance failed, we will try again later
     end
     
     # Returns +true+ if this connection is currently read locked.

data/lib/scout_agent/id_card.rb

@@ -111,7 +111,7 @@ module ScoutAgent
         if pid.flock(File::LOCK_EX | File::LOCK_NB)
           if pid.read =~ /\A\d+/
             begin
-              signal(0)  # check for the existing process
+              signal(0)          # check for the existing process
             rescue Errno::ESRCH  # no such process
               # stale PID file found, clearing it and reloading
               if revoke

data/lib/scout_agent.rb

@@ -91,7 +91,7 @@ module ScoutAgent
   end
 
   # The version of this agent.
-  VERSION = "3.1.8".freeze
+  VERSION = "3.1.9".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.1.8
+  version: 3.1.9
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-14 00:00:00 -05:00
+date: 2009-05-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency