scout_agent 3.1.4 → 3.1.5

data/CHANGELOG

@@ -1,3 +1,14 @@
+== 3.1.5
+
+* Fixed a bug that could cause the agent to crash when shutting down if running
+  with --no-daemon
+* Switched DNS strategies so slow DNS resolving doesn't kill our background
+  threading for process monitoring
+* Relaxed the process monitoring timeout to ten seconds
+* Relaxed TERM to KILL timeouts to five seconds
+* Unwound some metaprogramming magic so some missing methods would show up in
+  the documentation
+
 == 3.1.4
 
 * Modified the API to no longer load the JSON gem if we already have JSON

data/lib/scout_agent/core_extensions.rb

@@ -157,7 +157,7 @@ module ScoutAgent
       # if the process has not yet exited.  The exit code for the process is
       # returned if it can be determined (+nil+ is returned otherwise).
       # 
-      def term_or_kill(child_pid, pause = 1)
+      def term_or_kill(child_pid, pause = 5)
         %w[TERM KILL].each { |signal|
           begin
             ::Process.kill(signal, child_pid)  # attempt to stop process

data/lib/scout_agent/lifeline.rb

@@ -12,7 +12,7 @@ module ScoutAgent
     # The number of seconds allowed to pass before the Agent subprocess is
     # considered unresponsive.
     # 
-    NO_CONTACT_TIMEOUT   = 5
+    NO_CONTACT_TIMEOUT   = 10
     #
     # The frequency with which the subprocess is expected to check-in.  This is
     # purposely set to a little under a second to give one more check-in
@@ -23,7 +23,7 @@ module ScoutAgent
     # The number of seconds the monitor will wait for a process to exit cleanly
     # before forcing a stop.
     # 
-    TERM_TO_KILL_PAUSE   = 1
+    TERM_TO_KILL_PAUSE   = 5
     #
     # The sequence of seconds this monitor will wait between restarts of the 
     # subprocess.  The initial values are short, to try and get running again as
@@ -97,11 +97,13 @@ module ScoutAgent
           @launch_and_monitor_thread.exit if @launch_and_monitor_thread
           # ask child process to exit
           log.info("Asking '#{@agent}' to stop.")
-          IDCard.new(@agent).signal("TERM")
+          begin
+            IDCard.new(@agent).signal("TERM")
+          rescue Errno::ESRCH  # no such process
+            # if already exited, so we are fine
+          end
         end
       end
-    rescue Errno::ESRCH  # no such process
-      # if already exited, so we are fine
     end
     
     #

data/lib/scout_agent/plan.rb

@@ -299,14 +299,24 @@ module ScoutAgent
       Pathname.new(super)
     end
     
-    # 
-    # This code defines OS specific path accessors that honor the +prefix_path+.
-    # These paths prefix all of the specific application paths.
-    # 
-    %w[os_config_path os_db_path os_pid_path os_log_path].each do |path|
-      define_method(path) {
-        prefix_path + super()
-      }
+    # The configuarion path for your operation system, using prefix_path().
+    def os_config_path
+      prefix_path + super
+    end
+    
+    # The database path for your operation system, using prefix_path().
+    def os_db_path
+      prefix_path + super
+    end
+    
+    # The PID file path for your operation system, using prefix_path().
+    def os_pid_path
+      prefix_path + super
+    end
+    
+    # The log path for your operation system, using prefix_path().
+    def os_log_path
+      prefix_path + super
     end
     
     # 
@@ -317,36 +327,59 @@ module ScoutAgent
       os_config_path + (super || "#{ScoutAgent.agent_name}.rb")
     end
     
+    # The database path for this agent, using prefix_path() and os_db_path().
+    def db_dir
+      os_db_path + (super || ScoutAgent.agent_name)
+    end
+    
+    # The PID file path for this agent, using prefix_path() and os_pid_path().
+    def pid_dir
+      os_pid_path + (super || ScoutAgent.agent_name)
+    end
+    
+    # The log path for this agent, using prefix_path() and os_log_path().
+    def log_dir
+      os_log_path + (super || ScoutAgent.agent_name)
+    end
+    
+    # 
+    # Builds the database directory for this agent, owned by +group_id+ but with
+    # full privileges for all.
+    # 
+    def build_db_dir(group_id)
+      build_dir(:db_dir, 0777, group_id)
+    end
+    
     # 
-    # This code defines the application specific directory paths, prefixed by
-    # +prefix_path+ and the related OS directory.  By default, these directories
-    # are named after the agent.
+    # Builds the PID file directory for this agent, owned by +group_id+ but
+    # readable by all.
     # 
-    %w[db pid log].each do |path|
-      define_method("#{path}_dir") {
-        send("os_#{path}_path") + (super() || ScoutAgent.agent_name)
-      }
+    def build_pid_dir(group_id)
+      build_dir(:pid_dir, 0775, group_id)
     end
     
     # 
-    # This code creates builders for the configuration directories.  These
-    # methods build the directories and set their group and permissons so
-    # they can be written to after the daemon surrenders super user privileges.
+    # Builds the log directory for this agent, owned by +group_id+ but with full
+    # privileges for all.
     # 
-    { :db_dir  => 0777,
-      :pid_dir => 0775,
-      :log_dir => 0777 }.each do |path, permissions|
-      define_method("build_#{path}") { |group_id|
-        begin
-          send(path).mkpath
-          send(path).chown(nil, group_id)
-          send(path).chmod(permissions)
-          true
-        rescue Errno::EACCES, Errno::EPERM   # don't have permission
-          false
-        end
-      }
+    def build_log_dir(group_id)
+      build_dir(:log_dir, 0777, group_id)
+    end
+    
+    #
+    # Creates +path+, sets the +group_id+ for it, and gives it +permissions+. 
+    # Returns +true+ if all of that succeeds, +false+ otherwise (due to
+    # permission issues).
+    # 
+    def build_dir(path, permissions, group_id)
+      send(path).mkpath
+      send(path).chown(nil, group_id)
+      send(path).chmod(permissions)
+      true
+    rescue Errno::EACCES, Errno::EPERM   # don't have permission
+      false
     end
+    private :build_dir
     
     #############
     ### URL's ###

data/lib/scout_agent.rb

@@ -33,6 +33,10 @@ require_lib_or_gem "rest_client",   "=0.9.2"
 require_lib_or_gem "xmpp4r",        "=0.4"
 require_lib_or_gem "xmpp4r/roster"  # loads from xmpp4r's version
 
+# *IMPORTANT*:  make sure slow DNS requests don't kill our background threading
+require "resolv-replace"
+Socket.do_not_reverse_lookup = true
+
 # The namespace for all agent software.
 module ScoutAgent
   # Returns the name of the agent executable.
@@ -91,7 +95,7 @@ module ScoutAgent
   end
 
   # The version of this agent.
-  VERSION = "3.1.4".freeze
+  VERSION = "3.1.5".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.4
+  version: 3.1.5
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-08 00:00:00 -05:00
+date: 2009-05-12 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency