summaryrefslogtreecommitdiff
path: root/lib/custodian
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2012-11-26 12:14:43 +0000
committerSteve Kemp <steve@steve.org.uk>2012-11-26 12:14:43 +0000
commit90f223270012a85993029a03f80685bb7613458a (patch)
tree4487f78187c3fab6ce6b0990316dc16ce402bef4 /lib/custodian
parentcdadeaa09269e74cacfdc1136ebb4ed85719c652 (diff)
Updated to make the requirement of redis soft, as it will probably be
not used.
Diffstat (limited to 'lib/custodian')
-rw-r--r--lib/custodian/alerts/redis-state.rb29
1 files changed, 16 insertions, 13 deletions
diff --git a/lib/custodian/alerts/redis-state.rb b/lib/custodian/alerts/redis-state.rb
index 1b57b2e..b2243f7 100644
--- a/lib/custodian/alerts/redis-state.rb
+++ b/lib/custodian/alerts/redis-state.rb
@@ -1,5 +1,3 @@
-
-
#
# The redis-alerter.
#
@@ -14,7 +12,7 @@ module Custodian
module Alerter
- class AlertRedis < AlertFactory
+ class RedisAlert < AlertFactory
#
# The test this alerter cares about
@@ -26,22 +24,25 @@ module Custodian
#
attr_reader :redis
+ attr_reader :available
#
# Constructor - save the test-object away & instantiate
# the redis connection.
#
def initialize( obj )
-
- begin
- require 'rubygems'
- require 'redis'
- rescue LoadError
- raise "ERROR Loading redis rubygem!"
- end
-
- @test = obj
- @redis = Redis.new
+ @available = true
+
+ begin
+ require 'rubygems'
+ require 'redis'
+ rescue
+ puts "LOADING redis failed"
+ @available = false
+ end
+
+ @test = obj
+ @redis = Redis.new( ) if ( @available )
end
@@ -50,6 +51,7 @@ module Custodian
# Store an alert in redis
#
def raise
+ return if ( ! @available )
# hostname + test-type
host = @test.target
@@ -69,6 +71,7 @@ module Custodian
# Clear an alert in redis
#
def clear
+ return if ( ! @available )
# hostname + test-type
host = @test.target