scout 5.5.5 → 5.5.6.pre

data/CHANGELOG

@@ -1,3 +1,7 @@
+== 5.5.6
+
+* PID file rescue fix
+
 == 5.5.5
 
 * Fix for blank PID file

data/lib/scout/command.rb

@@ -236,26 +236,28 @@ module Scout
       rescue
         running = true
         pid = File.read(pid_file).strip.to_i rescue "unknown"
-        if pid.zero? 
-          running = false
-        else
-          begin
-            Process.kill(0, pid)
-            if stat = File.stat(pid_file)
-              if mtime = stat.mtime
-                if Time.now - mtime > 25 * 60  # assume process is hung after 25m
-                  log.info "Trying to KILL an old process..." if log
-                  Process.kill("KILL", pid)
-                  running = false
+        if pid.is_a?(Fixnum)
+          if pid.zero? 
+            running = false
+          else
+            begin
+              Process.kill(0, pid)
+              if stat = File.stat(pid_file)
+                if mtime = stat.mtime
+                  if Time.now - mtime > 25 * 60  # assume process is hung after 25m
+                    log.info "Trying to KILL an old process..." if log
+                    Process.kill("KILL", pid)
+                    running = false
+                  end
                 end
               end
+            rescue Errno::ESRCH
+              running = false
+            rescue
+              # do nothing, we didn't have permission to check the running process
             end
-          rescue Errno::ESRCH
-            running = false
-          rescue
-            # do nothing, we didn't have permission to check the running process
-          end
-        end # pid.zero?
+          end # pid.zero?
+        end # pid.is_a?(Fixnum)
         if running
           if pid == "unknown"
             log.warn "Could not create or read PID file.  "                +

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.5.5"
+  VERSION = "5.5.6.pre"
 end

metadata

@@ -1,8 +1,8 @@
 --- !ruby/object:Gem::Specification
 name: scout
 version: !ruby/object:Gem::Version
-  version: 5.5.5
-  prerelease: 
+  version: 5.5.6.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Andre Lewis
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-03 00:00:00.000000000 Z
+date: 2012-08-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elif
-  requirement: &2157262900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,12 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2157262900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ! 'Scout makes monitoring and reporting on your web applications as flexible
   and simple as possible.
 
@@ -232,12 +237,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: scout
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Web-based monitoring, reporting, and alerting for your servers, clusters,