servicemonitor 0.0.3 → 0.0.4

data/bin/servicemonitor

@@ -11,6 +11,11 @@ require "MonitorType/Threshold"
 require "MonitorType/Dir"
 require "MonitorManager"
 
+def log( string, verbose=false )
+	if !ENV["VERBOSE"].nil? || verbose==false then
+		puts string
+	end
+end
 
 if ARGV.length == 1 then
         dslName = ARGV[0]
@@ -21,6 +26,7 @@ end
 
 $a = MonitorManager.new
 
+log "Loading dsl, #{dslName}"
 load dslName
 
 $a.run

data/lib/MonitorType.rb

@@ -7,11 +7,13 @@ class MonitorType
     
     def initialize( name, params )
         @name = name
-	@email = params[:email]
-
-	cron_string = params[:cron] || "0 1 * * *"
+        @email = params[:email]
+        
+        cron_string = params[:cron] || "0 1 * * *"
         @cron = CronParser.new(cron_string)
-	@next = Time.now - 1
+        @next = Time.now - 1
+        
+        log "Loaded Monitor, #{@name}."
     end
     
     #Overload this method if any parameters should be checked
@@ -23,21 +25,22 @@ class MonitorType
     end
     
     def run
-	if Time.now > @next then
-	  begin 
-	  @next = @cron.next( Time.now )
-          self.sanitise
-          self.process
-          rescue MonitorTypeExceptionHandled => e
-          m.alert( e.message )
-        end
+        if Time.now > @next then
+            begin
+                @next = @cron.next( Time.now )
+                log "Monitor, #{@name}, next run time, #{@next}"
+                self.sanitise
+                self.process
+                rescue MonitorTypeExceptionHandled => e
+                m.alert( e.message )
+            end
         end
     end
-
-
+    
+    
 	def alert( string )
         body = "#{@name} tripped.\n#{string}"
-        
+        puts "*** "
 		if !@email.nil? then
 			Alert_Email.new( @email, body ).Send
             puts "Emailed, @email, Body, #{body}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: servicemonitor
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: