scout_agent 3.1.2 → 3.1.3

data/CHANGELOG

@@ -1,3 +1,10 @@
+== 3.1.3
+
+* Modified file modes to match lock types to get the file locking code running
+  on Solaris
+* Fixed a variable name conflict
+* Cleaned up some of the mission error catching code
+
 == 3.1.2
 
 * Fixed a bug that caused the mission tester to error out when trying to update

data/lib/scout_agent.rb

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

data/lib/scout_agent/agent/master_agent.rb

@@ -192,15 +192,15 @@ module ScoutAgent
               )
             end
           rescue Timeout::Error  # Mission exceeded allowed execution
-            status       = Process.term_or_kill(@mission_pid)
-            @mission_pid = nil
-            log.error( "#{mission[:name]} took too long to run:  " +
-                       "#{status && status.exitstatus}." )
+            killed_status = Process.term_or_kill(@mission_pid)
+            status_str    = killed_status && killed_status.exitstatus
+            @mission_pid  = nil
+            log.error("#{mission[:name]} took too long to run:  #{status_str}.")
             @db.write_report(
               mission[:id],
               :error,
               :subject => "#{mission[:name]} took too long to run",
-              :body    => "Exit status:  #{status && status.exitstatus}"
+              :body    => "Exit status:  #{status_str}"
             )
           end
           # prevent an infinite loop if we can't complete the mission
@@ -363,8 +363,8 @@ module ScoutAgent
         status("Compiling")
         begin
           eval(mission[:code], TOPLEVEL_BINDING, mission[:name])
-        rescue Exception => error       # any compile error
-          raise if $!.is_a? SystemExit  # don't catch exit() calls
+        rescue Exception => error          # any compile error
+          raise if error.is_a? SystemExit  # don't catch exit() calls
           log.error( "#{mission[:name]} could not be compiled:  " +
                      "#{error.message} (#{error.class})." )
           reported = @db.write_report(

data/lib/scout_agent/assignment/snapshot.rb

@@ -31,11 +31,16 @@ module ScoutAgent
         end
         
         # 
-        # lock on this file to ensure only one process can run a snapshot at a
-        # time
+        # lock on an external lock file to ensure only one process can run a
+        # snapshot at a time
         # 
-        open(__FILE__) do |this_file|
-          unless this_file.flock(File::LOCK_EX | File::LOCK_NB)
+        (Plan.db_dir + "snapshot_in_progress.lock").open("a") do |lock|
+          begin
+            lock.chmod(0777)  # make sure this file is shared by all
+          rescue Exception    # we didn't create the file
+            # do nothing:  the creator already switched the permissions
+          end
+          unless lock.flock(File::LOCK_EX | File::LOCK_NB)
             exit  # snapshot in progress
           end
         
@@ -115,7 +120,7 @@ module ScoutAgent
           ScoutAgent.remove_old_log_files(log)
           
           log.info("Snapshot complete.")
-          this_file.flock(File::LOCK_UN)  # release our snapshot lock
+          lock.flock(File::LOCK_UN)  # release our snapshot lock
         end
       end
       

data/lib/scout_agent/database.rb

@@ -150,7 +150,12 @@ module ScoutAgent
       # external locking mechanism on the database code file to prevent doubled
       # +VACUUM+ race conditions.
       # 
-      (LIB_DIR + "database/#{self.class.short_name.snake_case}.rb").open do |db|
+      Pathname.new(path.to_s.sub(/\.sqlite\z/, ".lock")).open("a") do |db|
+        begin
+          db.chmod(0777)  # make sure this file is shared by all
+        rescue Exception  # we didn't create the file
+          # do nothing:  the creator already switched the permissions
+        end
         db.flock(File::LOCK_EX)
         begin
           if @sqlite.first_value_from(
@@ -174,6 +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
     end
     
     # Returns +true+ if this connection is currently read locked.

data/lib/scout_agent/id_card.rb

@@ -107,7 +107,7 @@ module ScoutAgent
       end
       true
     rescue Errno::EEXIST  # pid_file already exists
-      File.open(pid_file) do |pid|
+      File.open(pid_file, "r+") do |pid|
         if pid.flock(File::LOCK_EX | File::LOCK_NB)
           if pid.read =~ /\A\d+/
             begin

data/lib/scout_agent/mission.rb

@@ -294,15 +294,15 @@ module ScoutAgent
         if self.class.needs.all? { |l| library_available?(l) }
           begin
             build_report
-          rescue Exception
-            raise if $!.is_a? SystemExit  # don't catch exit() calls
+          rescue Exception => error          # an error while running the code
+            raise if error.is_a? SystemExit  # don't catch exit() calls
             error "#{@name} run failed with an error", <<-END_ERROR.trim
             Error:
-              #{$!.class}
+              #{error.class}
             Message:
-              #{$!.message}
+              #{error.message}
             Backtrace:
-            #{$!.backtrace.map { |line| "  #{line}\n" }.join}
+            #{error.backtrace.map { |line| "  #{line}\n" }.join}
             END_ERROR
           end
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout_agent
 version: !ruby/object:Gem::Version 
-  version: 3.1.2
+  version: 3.1.3
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-03 00:00:00 -05:00
+date: 2009-05-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -182,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scout
-rubygems_version: 1.3.2
+rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
 summary: Scout makes monitoring and reporting on your servers as flexible and simple as possible.