servicemonitor 0.0.1 → 0.0.2

data/lib/Alert.rb

@@ -1,6 +1,7 @@
 
 class Alert
+    
 	def Send( destination, body )
-                raise "Method needs to be overridden"
+        raise "Method needs to be overridden"
 	end
 end

data/lib/MonitorManager.rb

@@ -10,7 +10,12 @@ class MonitorManager
 
         def run
                 @list.each do |m|
+                    begin
+                        m.sanitise
                         m.run
+                    rescue MonitorTypeExceptionHandled => e
+                        m.alert( )
+                    end
                 end
         end
 end

data/lib/MonitorType.rb

@@ -1,20 +1,38 @@
 
+class MonitorTypeExceptionHandled<StandardError
+end
+
 class MonitorType
     
-    def initialize( params )
+    def initialize( name, params )
+        @name = name
 		@email = params[:email]
 	end
     
-    def run
+    #Overload this method if any parameters should be checked
+    def sanitise
+    end
+    
+    def process
         raise "Method needs to be overridden"
     end
     
+    def run
+        self.sanitise
+        self.process
+        rescue MonitorTypeExceptionHandled => e
+        m.alert( e.message )
+    end
+
+
 	def alert( string )
+        body = "#{@name} tripped.\n#{string}"
+        
 		if !@email.nil? then
-			Alert_Email.new( @email, string ).Send
-            puts "Emailed, @email, Body, #{string}"
+			Alert_Email.new( @email, body ).Send
+            puts "Emailed, @email, Body, #{body}"
             else
-            puts "*** Alert, no alert destination specified. Body, #{string}"
+            puts body
 		end
 	end
     

data/lib/MonitorType/Dir.rb

@@ -9,31 +9,35 @@ class MonitorType_Dir<MonitorType_Threshold
             puts "*** Warning. Directory is not writable, #{@path}."
             puts "*** Warning. Make the directory, #{@path}, writable and try again."
         end
+
         rescue Errno::ENOENT => e
-        puts "***** Directory does not exist, #{@path}."
-        puts "***** Create the directory, #{@path}, and try again."
-        puts "***** eg, mkdir #{@path}"
-        abort();
+        string = "***** Directory does not exist, #{@path}.\n"
+        string = "#{string}***** Create the directory, #{@path}, and try again.\n"
+        string = "#{string}***** eg, mkdir #{@path}"
+        raise MonitorTypeExceptionHandled.new(string)
         rescue Errno::ENOTDIR => e
-        puts "***** The specified path does not point to a directory, #{@path}."
-        puts "***** Either repoint path to a directory, or remove, #{@path}, and create it as a directory."
-        puts "***** eg, rm #{@path} && mkdir #{@path}"
-        abort();
+        string = "***** The specified path does not point to a directory, #{@path}.\n"
+        string = "#{string}***** Either repoint path to a directory, or remove, #{@path}, and create it as a directory.\n"
+        string = "#{string}***** eg, rm #{@path} && mkdir #{@path}"
+        raise MonitorTypeExceptionHandled.new(string)
 	end
-    
-	def initialize( path, params )
-		super( params )
+
+	def initialize( name, path, params )
+		super( name, params )
 		@path = path
 		self.sanitise
+    rescue MonitorTypeExceptionHandled => e
+        puts e.message
+        abort()
 	end
-    
-	def run
+
+	def process
 		number_of_files = Dir.glob( "#{@path}/*" ).length
-		self.check( number_of_files )
+		self.check( number_of_files, "Checking number of files in, #{@path}" )
 	end
 end
 
-def dir( path, params )
-    $a.add( MonitorType_Dir.new( path, params ) )
+def dir( name, path, params )
+    $a.add( MonitorType_Dir.new( name, path, params ) )
 end
 

data/lib/MonitorType/Threshold.rb

@@ -1,19 +1,19 @@
 
 class MonitorType_Threshold<MonitorType
 
-	def initialize( params )
-                @min = params[:min] ||= 0
-                @max = params[:max]
-		super( params )
+	def initialize( name, params )
+        @min = params[:min] ||= 0
+        @max = params[:max]
+		super( name, params )
 	end
 
-	def check( value )
-                if !@min.nil? && value < @min then
-                        self.alert( "MIN" )
-                end
-                if !@max.nil? && value > @max then
-                        self.alert( "MAX" )
-                end
-
+	def check( value, context_sentence )
+        if !@min.nil? && value < @min then
+            self.alert( "#{context_sentence}\nMinimum threshold exceeded. Minimum: #{@min}, Actual: #{value}" )
+        end
+        if !@max.nil? && value > @max then
+            self.alert( "#{context_sentence}\nMaximum threshold exceeded. Maximum: #{@max}, Actual: #{value}" )
+        end
+        
 	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servicemonitor
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2013-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: parse-cron
-  requirement: &70266973839860 !ruby/object:Gem::Requirement
+  requirement: &70176457205720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70266973839860
+  version_requirements: *70176457205720
 - !ruby/object:Gem::Dependency
   name: beanstalk-client
-  requirement: &70266973838800 !ruby/object:Gem::Requirement
+  requirement: &70176457205260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70266973838800
+  version_requirements: *70176457205260
 - !ruby/object:Gem::Dependency
   name: fluiddb
-  requirement: &70266973837960 !ruby/object:Gem::Requirement
+  requirement: &70176457204800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70266973837960
+  version_requirements: *70176457204800
 description: Monitor various parts of the system
 email: guy@guyirvine.com
 executables: