scout_agent 3.2.5 → 3.2.6

data/CHANGELOG

@@ -1,3 +1,9 @@
+== 3.2.6
+
+* Upgraded to Amalgalite 0.10.0
+* Added an extra Timeout.timeout() loop to all API requests in an attempt to
+  avoid Net::HTTP hanging on server errors
+
 == 3.2.5
 
 * Added a workaround for an issue in RestClient 1.0 (an incorrect error)

data/Rakefile

@@ -36,7 +36,7 @@ SA_SPEC = Gem::Specification.new do |spec|
 	spec.require_path = "lib"
 	
   spec.add_dependency("arrayfields", "=4.7.3")  # fix Amalgalite's results
-  spec.add_dependency("amalgalite",  "=0.9.0")
+  spec.add_dependency("amalgalite",  "=0.10.0")
   spec.add_dependency("rest-client", "=1.0")
   spec.add_dependency("json",        "=1.1.6")
   spec.add_dependency("xmpp4r",      "=0.4")

data/lib/scout_agent.rb

@@ -28,7 +28,7 @@ require "scout_agent/api"
 
 # require gems
 require_lib_or_gem "json",          "=1.1.6"
-require_lib_or_gem "amalgalite",    "=0.9.0"
+require_lib_or_gem "amalgalite",    "=0.10.0"
 require_lib_or_gem "rest_client",   "=1.0"
 require_lib_or_gem "xmpp4r",        "=0.4"
 require_lib_or_gem "xmpp4r/roster"  # loads from xmpp4r's version
@@ -92,7 +92,7 @@ module ScoutAgent
   end
 
   # The version of this agent.
-  VERSION = "3.2.5".freeze
+  VERSION = "3.2.6".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/server.rb

@@ -7,6 +7,16 @@ module ScoutAgent
   # Public methods are provided for each action you can perform againt the API.
   # 
   class Server
+    # A custom Exception, used to avoid conflicts with Timeout::Error.
+    class AgentTimeoutError < RuntimeError; end
+    
+    # 
+    # Another Timeout for Net::Http requests.  Their limit doesn't always seem
+    # to trigger in the face of server errors, so we add this redundant check to
+    # avoid hanging on check-in.
+    # 
+    REQUEST_TIMEOUT = 5 * 60
+    
     # 
     # Create a new API wrapper, optionally with a +log+ to write connection
     # details to.
@@ -39,7 +49,7 @@ module ScoutAgent
     # +nil+ is returned if the plan cannot be retrieved for some reason.
     # 
     def get_plan(additional_headers = { })
-      no_warnings {  # keep OpenSSL quiet
+      request {
         @rest_client["plan.scout"].get(additional_headers)
       }
     rescue Zlib::Error  # could not decompress response
@@ -73,7 +83,7 @@ module ScoutAgent
       gzip =  Zlib::GzipWriter.new(io)
       gzip << data.to_json
       gzip.close
-      no_warnings do  # keep OpenSSL quiet
+      request do
         @rest_client["checkin.scout"].post(
           io.string,
           :content_type     => "application/json",
@@ -108,7 +118,7 @@ module ScoutAgent
     # the upload succeeded.
     # 
     def post_log(log_file)
-      no_warnings do  # keep OpenSSL quiet
+      request do
         @rest_client["log.scout"].post(
           log_file.read,
           :content_type     => "text/plain",
@@ -128,5 +138,21 @@ module ScoutAgent
       log.warn("Log could not be sent:  #{error.class}.")
       false  # could not send log
     end
+  
+    #######
+    private
+    #######
+  
+    # 
+    # A simple helper that silences some OpenSSL warnings and wraps the passed
+    # block in a +REQUEST_TIMEOUT+ limited execution.
+    # 
+    def request
+      no_warnings {  # keep OpenSSL quiet
+        Timeout.timeout(REQUEST_TIMEOUT, AgentTimeoutError) {
+          return yield
+        }
+      }
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout_agent
 version: !ruby/object:Gem::Version 
-  version: 3.2.5
+  version: 3.2.6
 platform: ruby
 authors: 
 - James Edward Gray II
@@ -12,7 +12,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-01 00:00:00 -05:00
+date: 2009-06-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -33,7 +33,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.9.0
+        version: 0.10.0
     version: 
 - !ruby/object:Gem::Dependency 
   name: rest-client