scout 5.5.4 → 5.5.5

data/CHANGELOG

@@ -1,3 +1,8 @@
+== 5.5.5
+
+* Fix for blank PID file
+* Added client version + hostname when starting run in debug mode
+
 == 5.5.4
 
 * Fixes warnings with Ruby 1.9.3p0

data/README.markdown

@@ -0,0 +1,65 @@
+# Scout Server Monitoring Agent
+
+[Scout](https://scoutapp.com) is an easy-to-use hosted server monitoring service. The `scout` Ruby gem reports metrics to our service. The agent runs plugins, configured via the Scout web interface, to monitor a server. [View a list of available plugins on our website](https://scoutapp.com/plugin_urls) and [their source on Github](http://github.com/scoutapp/scout-plugins). 
+
+## Installing
+
+Install the Scout gem:
+
+    $ gem install scout
+
+Then simply run:
+
+    $ scout
+
+to start the installation wizard. You'll need your server key, provided via Scout's web UI, to continue. Scout's web UI also provides additional troubleshooting and Ruby installation instructions.
+
+## Running the Scout Agent
+
+The Scout agent has several modes of operation and commands.  The normal, intended usage is through a scheduled interval with no output.
+
+Normal checkin with server:
+
+    $ scout [OPTIONS] SERVER_KEY
+
+Install:
+
+    $ scout
+    $ scout [OPTIONS] install
+
+Local plugin testing:
+
+    $ scout [OPTIONS] test PATH_TO_PLUGIN [PLUGIN_OPTIONS]
+
+
+`SERVER_KEY` is the identification key assigned by your account at http://scoutapp.com.
+
+`PATH_TO_PLUGIN` is the file system path to a Ruby file that contains a Scout plugin.
+
+`PLUGIN_OPTIONS` are one or more options in the form:
+
+    key1=val1 key2=val2
+    
+These options will be used for the plugin run.
+
+## Setting up in Cron
+
+Configure Scout to run every minute. Typically, this will look like:
+
+    * * * * *  deploy /usr/bin/scout SERVER_KEY
+
+It's often helpful to log the output to a file. To do so:
+
+    * * * * *  deploy /usr/bin/scout SERVER_KEY > /path/to/anywhere/scout.out 2>&1
+    
+## Troubleshooting
+
+Extensive help is available via our website (http://scoutapp.com) and while installing the agent via the Scout web UI.
+
+## Credits / Contact
+
+Contact support@scoutapp.com with questions.
+
+Primary maintainers: Andre Lewis (andre@scoutapp.com) and Derek Haynes (derek@scoutapp.com)
+
+Many thanks to James Edward Gray II, Charles Brian Quinn, and Matt Todd for early work on the Scout agent!

data/lib/scout/command.rb

@@ -234,24 +234,28 @@ module Scout
           end
         end
       rescue
-        pid     = File.read(pid_file).strip.to_i rescue "unknown"
         running = true
-        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
+        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
+                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?
         if running
           if pid == "unknown"
             log.warn "Could not create or read PID file.  "                +

data/lib/scout/command/run.rb

@@ -7,6 +7,7 @@ module Scout
         key = @args.first
         # TODO: this is an awkward way to force creation of the config directory. Could use a little refactoring.
         configuration_directory = config_dir
+        log.debug("Running Scout [#{Scout::VERSION}] on #{Socket.gethostname}") if log
         log.debug("Configuration directory is #{configuration_directory} ") if log
         # TODO: too much external logic of command doing things TO server. This should be moved into the server class.
         @scout = Scout::Server.new(server, key, history, log, server_name, @http_proxy, @https_proxy)

data/lib/scout/version.rb

@@ -1,3 +1,3 @@
 module Scout
-  VERSION = "5.5.4"
+  VERSION = "5.5.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scout
 version: !ruby/object:Gem::Version
-  version: 5.5.4
+  version: 5.5.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: elif
-  requirement: &2156074720 !ruby/object:Gem::Requirement
+  requirement: &2157262900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,7 +23,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2156074720
+  version_requirements: *2157262900
 description: ! 'Scout makes monitoring and reporting on your web applications as flexible
   and simple as possible.
 
@@ -38,7 +38,7 @@ files:
 - CHANGELOG
 - Gemfile
 - LICENSE
-- README
+- README.markdown
 - Rakefile
 - bin/scout
 - data/cacert.pem

data/README

@@ -1,74 +0,0 @@
-= ReadMe
-
-Scout by Highgroove Studios
-
-== Description
-
-The easier way to monitor servers and web applications.
-
-Scout makes monitoring and reporting on your web applications
-as flexible and simple as possible.
-
-Scout is a product of Highgroove Studios.
-Please visit http://scoutapp.com for more information.
-
-== Installing
-
-Install the Scout gem:
-
-  $ sudo gem install scout
-
-Then simply run:
-
-  $ scout
-
-to run the installation wizard.  You'll need your server key to continue. Get the server key from your account at http://scoutapp.com
-
-== Running the Scout Client
-
-The Scout client has several modes of operation and commands.  The normal, intended usage is through a scheduled interval with no output.
-
-Normal checkin with server:
-  $ scout [OPTIONS] SERVER_KEY
-  ... OR ...
-  $ scout [OPTIONS] run SERVER_KEY
-
-Install:
-  $ scout
-  ... OR ...
-  $ scout [OPTIONS] install
-
-Local plugin testing:
-  $ scout [OPTIONS] test PATH_TO_PLUGIN [PLUGIN_OPTIONS]
-
-
-SERVER_KEY is the identification key assigned by your account at http://scoutapp.com
-
-PATH_TO_PLUGIN is the file system path to a Ruby file
-that contains a Scout plugin.
-
-PLUGIN_OPTIONS are one or more options in the form:
-key1=val1 key2=val2
-These options will be used for the plugin run.
-
-
-== Setting up in cron
-
-Configure Scout to run every minute. Typically, this will look like:
-
-  * * * * *  deploy /usr/bin/scout SERVER_KEY
-
-It's often helpful to log the output to a file. To do so:
-
-  * * * * *  deploy /usr/bin/scout SERVER_KEY > /path/to/anywhere/scout.out 2>&1
-
-
-For additional help, please visit http://scoutapp.com
-
-== Credits / Contact
-
-Contact support@scoutapp.com with questions.
-
-Primary maintainers: Andre Lewis (andre@scoutapp.com) and Derek Haynes (derek@scoutapp.com)
-
-Many thanks to James Edward Gray II, Charles Brian Quinn, and Matt Todd for early work on the Scout agent!