scout 2.0.6 → 2.0.7

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 2.0.7
+
+* Improved PID file error messages
+* Adding a redundant Timeout to work around Net::HTTP hangs
+
 == 2.0.6
 
 * Adding plugin dependency support via the new needs() class method

data/lib/scout.rb

@@ -5,5 +5,5 @@ require "scout/plugin"
 require "scout/server"
 
 module Scout
-  VERSION = "2.0.6".freeze
+  VERSION = "2.0.7".freeze
 end

data/lib/scout/command.rb

@@ -205,7 +205,13 @@ module Scout
           # do nothing, we didn't have permission to check the running process
         end
         if running
-          log.warn "Process #{pid} was already running" if log
+          if pid == "unknown"
+            log.warn "Could not create or read PID file.  "                +
+                     "You may need to the path to the config directory.  " +
+                     "See:  http://scoutapp.com/help#data_file" if log
+          else
+            log.warn "Process #{pid} was already running" if log
+          end
           exit
         else
           log.info "Stale PID file found.  Clearing it and reloading..." if log

data/lib/scout/server.rb

@@ -9,6 +9,8 @@ module Scout
   class Server
     # A new class for plugin Timeout errors.
     class PluginTimeoutError < RuntimeError; end
+    # A new class for API Timeout errors.
+    class APITimeoutError < RuntimeError; end
     
     # The default URLS are used to communicate with the Scout Server.
     URLS = { :plan   => "/clients/CLIENT_KEY/plugins.scout?version=CLIENT_VERSION",
@@ -171,6 +173,7 @@ module Scout
       get(url, "Could not retrieve plan from server.") do |res|
         begin
           plugin_execution_plan = Marshal.load(res.body)
+          # pp plugin_execution_plan
           info "Plan loaded.  (#{plugin_execution_plan.size} plugins:  " +
                "#{plugin_execution_plan.map { |p| p[:name] }.join(', ')})"
         rescue TypeError
@@ -283,12 +286,16 @@ module Scout
     end
     
     def request(url, response_handler, error, &connector)
-      http             = Net::HTTP.new(url.host, url.port)
-      if url.is_a? URI::HTTPS
-        http.use_ssl     = true
-        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      response           = nil
+      Timeout.timeout(5 * 60, APITimeoutError) do
+        http               = Net::HTTP.new(url.host, url.port)
+        if url.is_a? URI::HTTPS
+          http.use_ssl     = true
+          http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+        end
+        response           = no_warnings { http.start(&connector) }
       end
-      case response    = no_warnings { http.start(&connector) }
+      case response
       when Net::HTTPSuccess
         response_handler[response] unless response_handler.nil?
       else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors: 
 - Highgroove Studios
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-08-28 00:00:00 -04:00
+date: 2009-06-30 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -22,7 +22,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
-description: Scout makes monitoring and reporting on your web applications as flexible and simple as possible.  Scout is a product of Highgroove Studios.
+description: |
+  Scout makes monitoring and reporting on your web applications as flexible and simple as possible.
+  
+  Scout is a product of Highgroove Studios.
+
 email: scout@highgroove.com
 executables: 
 - scout
@@ -57,6 +61,8 @@ files:
 - LICENSE
 has_rdoc: true
 homepage: http://scoutapp.com
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --title
@@ -80,9 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scout
-rubygems_version: 1.2.0
+rubygems_version: 1.3.4
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: Scout makes monitoring and reporting on your web applications as flexible and simple as possible.
 test_files: []