servicemonitor 0.0.15 → 0.0.16

data/lib/MonitorType.rb

@@ -24,6 +24,8 @@ class MonitorType
             puts "*** :name => <name of monitor>"
             abort
         end
+        @params = params
+        @block = params[:block] if !params[:block].nil?
         @name = params[:name]
         @email = params[:email]
         if !@email.nil? then
@@ -75,7 +77,7 @@ class MonitorType
             end
         end
     end
-    
+
     #Called when a monitor has been tripped
     #
     # @param [String] string A description of the trip that occurred

data/lib/MonitorType/Beanstalk.rb

@@ -22,13 +22,16 @@ class MonitorType_Beanstalk<MonitorType_Threshold
             abort
         end
         @queue = params[:queue]
+        
+        @context_sentence = "Checking number of jobs in queue, #{@queue}"
+
 		self.sanitise
         rescue MonitorTypeExceptionHandled => e
         puts e.message
         abort()
 	end
     
-	def process
+	def getValue
         count = 0
         begin
         tubeStats = @beanstalk.stats_tube(@queue)
@@ -36,7 +39,7 @@ class MonitorType_Beanstalk<MonitorType_Threshold
         rescue Beanstalk::NotFoundError=>e
         end
 
-		self.check( count, "Checking number of jobs in queue, #{@queue}" )
+		return count
 	end
 end
 

data/lib/MonitorType/Dir.rb

@@ -34,15 +34,17 @@ class MonitorType_Dir<MonitorType_Threshold
             abort
         end
 		@path = params[:path]
+
+        @context_sentence = "Checking number of files in, #{@path}"
+
 		self.sanitise
     rescue MonitorTypeExceptionHandled => e
         puts e.message
         abort()
 	end
 
-	def process
-		number_of_files = Dir.glob( "#{@path}/*" ).length
-		self.check( number_of_files, "Checking number of files in, #{@path}" )
+	def getValue
+		return Dir.glob( "#{@path}/*" ).length
 	end
 end
 

data/lib/MonitorType/FluidDb.rb

@@ -58,16 +58,17 @@ class MonitorType_FluidDb<MonitorType_Threshold
             abort
         end
         @sql = params[:sql]
+
+        @context_sentence = "Checking result of sql query, #{@sql}"
+
 		self.sanitise
         rescue MonitorTypeExceptionHandled => e
         puts e.message
         abort()
 	end
     
-	def process
-        value = @fluidDb.queryForValue( @sql, [] )
-        
-		self.check( value, "Checking result of sql query, #{@sql}" )
+	def getValue
+        return @fluidDb.queryForValue( @sql, [] )
 	end
 end
 

data/lib/MonitorType/Threshold.rb

@@ -9,14 +9,35 @@ class MonitorType_Threshold<MonitorType
 		super( params )
 	end
 
+    #Get the context dependent value which is to be checked
+    def getValue
+        raise "Method needs to be overridden"
+    end
+
+    def process
+        if @block.nil? then
+            value = self.getValue
+            else
+            value = @block.call( @params )
+            puts "value: #{value}"
+        end
+    
+        self.check( value )
+    end
+
     #Provides the means to check a value against thresholds
-	def check( value, context_sentence )
+	def check( value )
+        context_sentence = ""
+        if !@context_sentence.nil? then
+            context_sentence = "#{@context_sentence}\n"
+        end
+
         value = value.to_i
         if !@min.nil? && value < @min then
-            self.alert( "#{context_sentence}\nMinimum threshold exceeded. Minimum: #{@min}, Actual: #{value}" )
+            self.alert( "#{context_sentence}Minimum threshold exceeded. Minimum: #{@min}, Actual: #{value}" )
         end
         if !@max.nil? && value > @max then
-            self.alert( "#{context_sentence}\nMaximum threshold exceeded. Maximum: #{@max}, Actual: #{value}" )
+            self.alert( "#{context_sentence}Maximum threshold exceeded. Maximum: #{@max}, Actual: #{value}" )
         end
         
 	end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servicemonitor
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-31 00:00:00.000000000 Z
+date: 2013-11-02 00:00:00.000000000 Z
 dependencies: []
 description: Monitor various parts of the system
 email: guy@guyirvine.com