servicemonitor 0.0.6 → 0.0.8

data/bin/servicemonitor

@@ -29,7 +29,16 @@ end
 $a = MonitorManager.new
 
 log "Loading dsl, #{dslName}"
+begin
 load dslName
-
 $a.run
+rescue ArgumentError=>e
+    puts "*** Your dsl is not formatted correctly"
+    puts "*** Ensure each line has the format,"
+    puts "***   <command>, [:arg=>value]"
+rescue SystemExit=>e
+rescue Exception=>e
+    puts e.class.name
+    puts e.message
+end
 

data/lib/MonitorType.rb

@@ -5,8 +5,13 @@ end
 
 class MonitorType
     
-    def initialize( name, params )
-        @name = name
+    def initialize( params )
+        if params[:name].nil? then
+            puts "*** Monitor parameter missing, name"
+            puts "*** :name => <name of monitor>"
+            abort
+        end
+        @name = params[:name]
         @email = params[:email]
         
         cron_string = params[:cron] || "0 1 * * *"

data/lib/MonitorType/Beanstalk.rb

@@ -7,10 +7,15 @@ class MonitorType_Beanstalk<MonitorType_Threshold
         @beanstalk = Beanstalk::Pool.new([@connection_string])
 	end
     
-	def initialize( name, queue, params )
-		super( name, params )
+	def initialize( params )
+		super( params )
         @connection_string = params[:beanstalk] || "localhost:11300"
-        @queue = queue
+        if params[:queue].nil? then
+            puts "*** Beanstalk parameter missing, queue"
+            puts "*** :queue => <queue name>"
+            abort
+        end
+        @queue = params[:queue]
 		self.sanitise
         rescue MonitorTypeExceptionHandled => e
         puts e.message
@@ -18,13 +23,18 @@ class MonitorType_Beanstalk<MonitorType_Threshold
 	end
     
 	def process
+        count = 0
+        begin
         tubeStats = @beanstalk.stats_tube(@queue)
+        count = tubeStats["current-jobs-ready"]
+        rescue Beanstalk::NotFoundError=>e
+        end
 
-		self.check( tubeStats["current-jobs-ready"], "Checking number of jobs in queue, #{@queue}" )
+		self.check( count, "Checking number of jobs in queue, #{@queue}" )
 	end
 end
 
-def beanstalk( name, queue, params )
-    $a.add( MonitorType_Beanstalk.new( name, queue, params ) )
+def beanstalk( params )
+    $a.add( MonitorType_Beanstalk.new( params ) )
 end
 

data/lib/MonitorType/Dir.rb

@@ -22,9 +22,14 @@ class MonitorType_Dir<MonitorType_Threshold
         raise MonitorTypeExceptionHandled.new(string)
 	end
 
-	def initialize( name, path, params )
-		super( name, params )
-		@path = path
+	def initialize( params )
+		super( params )
+        if params[:path].nil? then
+            puts "*** Dir parameter missing, path"
+            puts "*** :path => <path to directory to be monitored>"
+            abort
+        end
+		@path = params[:path]
 		self.sanitise
     rescue MonitorTypeExceptionHandled => e
         puts e.message
@@ -37,7 +42,7 @@ class MonitorType_Dir<MonitorType_Threshold
 	end
 end
 
-def dir( name, path, params )
-    $a.add( MonitorType_Dir.new( name, path, params ) )
+def dir( params )
+    $a.add( MonitorType_Dir.new( params ) )
 end
 

data/lib/MonitorType/FluidDb.rb

@@ -4,13 +4,48 @@ require "MonitorType/Threshold"
 class MonitorType_FluidDb<MonitorType_Threshold
     
 	def sanitise
-        @fluidDb = FluidDb.Db( @uri )
+        begin
+            @fluidDb = FluidDb.Db( @uri )
+            rescue Exception=>e
+            puts "*** FluidDb encountered an error while connecting to the db"
+            puts "*** Error: #{e.message}"
+            puts "*** uri: #{@uri}"
+            puts "*** Please fix the error and run again"
+            abort()
+        end
+        
+        begin
+        value = @fluidDb.queryForValue( @sql, [] )
+        rescue Exception=>e
+            puts "*** FluidDb encountered an error while running the sql"
+            puts "*** sql: #{@sql}"
+            puts "*** Please fix the query and run again"
+            abort()
+        end
 	end
     
-	def initialize( name, uri, sql, params )
-		super( name, params )
-        @uri = URI.parse( uri )
-        @sql = sql
+	def initialize( params )
+		super( params )
+        if params[:uri].nil? then
+            puts "*** FluidDb parameter missing, uri"
+            puts "*** :uri => <uri pointing to db to be monitored>"
+            abort
+        end
+        begin
+            @uri = URI.parse( params[:uri] )
+        rescue URI::InvalidURIError=>e
+            puts "*** FluidDb encountered an error while parsing the uri"
+            puts "*** uri: #{params[:uri]}"
+            puts "*** Please fix the uri and run again"
+            abort()
+        end
+        
+        if params[:sql].nil? then
+            puts "*** FluidDb parameter missing, sql"
+            puts "*** :sql => <sql statement, producing a single column, single row which yeidls a number>"
+            abort
+        end
+        @sql = params[:sql]
 		self.sanitise
         rescue MonitorTypeExceptionHandled => e
         puts e.message
@@ -24,7 +59,7 @@ class MonitorType_FluidDb<MonitorType_Threshold
 	end
 end
 
-def fluiddb( name, uri, sql, params )
-    $a.add( MonitorType_FluidDb.new( name, uri, sql, params ) )
+def fluiddb( params )
+    $a.add( MonitorType_FluidDb.new( params ) )
 end
 

data/lib/MonitorType/Threshold.rb

@@ -1,10 +1,10 @@
 
 class MonitorType_Threshold<MonitorType
 
-	def initialize( name, params )
+	def initialize( params )
         @min = params[:min] ||= 0
         @max = params[:max]
-		super( name, params )
+		super( params )
 	end
 
 	def check( value, context_sentence )

metadata

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