scout 1.1.6 → 1.1.7

data/CHANGELOG

@@ -1,6 +1,7 @@
 == 1.1.6
 
-* minor documentation update in scout installation wizard
+* Introducing a delta for the plugin run interval, now allowing runs even if
+  they are up to 30 seconds early
 
 == 1.1.5
 

data/bin/scout

@@ -139,19 +139,11 @@ if [:client_key, :plugin].all? { |o| options[o].nil? } and
     puts <<-END_SUCCESS.gsub(/^ {4}/, "")
     
     Success!
-    
-    Now, you must setup Scout to run on a scheduled basis.
   
-    If you are using the system crontab (usually located at /etc/crontab):
+    ******* NOW, INSTALL IN CRONTAB *******
   
-    ****** START CRONTAB SAMPLE ******
-    */30 * * * *  #{USER} #{File.expand_path($PROGRAM_NAME)} #{options[:client_key]}
-    ******* END CRONTAB SAMPLE *******
+    */10 * * * *  #{USER} #{File.expand_path($PROGRAM_NAME)} #{options[:client_key]}
     
-    If you are using this current user's crontab (using crontab -e to edit):
-  
-    ****** START CRONTAB SAMPLE ******
-    */30 * * * *  #{File.expand_path($PROGRAM_NAME)} #{options[:client_key]}
     ******* END CRONTAB SAMPLE *******
     
     For help setting up Scout with crontab, please visit:

data/lib/scout.rb

@@ -4,5 +4,5 @@ require "scout/plugin"
 require "scout/server"
 
 module Scout
-  VERSION = "1.1.6".freeze
+  VERSION = "1.1.7".freeze
 end

data/lib/scout/server.rb

@@ -21,6 +21,11 @@ module Scout
     # otherwise, a timeout error is generated.
     # 
     PLUGIN_TIMEOUT = 60
+    #
+    # A fuzzy range of seconds in which it is okay to rerun a plugin.
+    # We consider the interval close enough at this point.
+    # 
+    RUN_DELTA = 30
     
     # Creates a new Scout Server connection.
     def initialize(server, client_key, history_file, logger = nil)
@@ -82,7 +87,8 @@ module Scout
       last_run = @history["last_runs"][plugin[:name]]
       memory   = @history["memory"][plugin[:name]]
       run_time = Time.now
-      if last_run.nil? or run_time >= last_run + plugin[:interval]
+      delta    = last_run.nil? ? nil : run_time - (last_run + plugin[:interval])
+      if last_run.nil? or delta.between?(-RUN_DELTA, 0) or delta >= 0
         debug "Plugin is past interval and needs to be run.  " +
               "(last run:  #{last_run || 'nil'})"
         debug "Compiling plugin..."

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: scout
 version: !ruby/object:Gem::Version 
-  version: 1.1.6
+  version: 1.1.7
 platform: ruby
 authors: 
 - Highgroove Studios
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-04-04 00:00:00 -04:00
+date: 2008-04-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -74,7 +74,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: scout
-rubygems_version: 1.0.1
+rubygems_version: 1.1.1
 signing_key: 
 specification_version: 2
 summary: Scout makes monitoring and reporting on your web applications as flexible and simple as possible.