summaryrefslogtreecommitdiff
path: root/lib/custodian/alerts/redis-state.rb
diff options
context:
space:
mode:
authorSteve Kemp <steve@steve.org.uk>2012-11-26 15:05:18 +0000
committerSteve Kemp <steve@steve.org.uk>2012-11-26 15:05:18 +0000
commit03cc30a210f6442060facfa0808077e04176f76b (patch)
tree4b68e6e84d26ad4bd2e3e5f1ac16f23ddf97720c /lib/custodian/alerts/redis-state.rb
parente1eb1603dbc13ca74fb197f36c5b6a68f61419eb (diff)
Don't attempt to raise/clear with redis/mauve unless they were loaded.
Diffstat (limited to 'lib/custodian/alerts/redis-state.rb')
-rw-r--r--lib/custodian/alerts/redis-state.rb37
1 files changed, 22 insertions, 15 deletions
diff --git a/lib/custodian/alerts/redis-state.rb b/lib/custodian/alerts/redis-state.rb
index b2243f7..38b592e 100644
--- a/lib/custodian/alerts/redis-state.rb
+++ b/lib/custodian/alerts/redis-state.rb
@@ -14,35 +14,38 @@ module Custodian
class RedisAlert < AlertFactory
+
#
# The test this alerter cares about
#
attr_reader :test
+
#
# The redis-object
#
attr_reader :redis
- attr_reader :available
+
+
#
# Constructor - save the test-object away & instantiate
# the redis connection.
#
def initialize( obj )
- @available = true
-
- begin
- require 'rubygems'
- require 'redis'
- rescue
- puts "LOADING redis failed"
- @available = false
- end
-
- @test = obj
- @redis = Redis.new( ) if ( @available )
+
+ begin
+ require 'rubygems'
+ require 'redis'
+
+ @redis = Redis.new()
+
+ rescue
+ puts "ERROR Loading redis rubygem!"
+ end
+
+ @test = obj
end
@@ -51,7 +54,9 @@ module Custodian
# Store an alert in redis
#
def raise
- return if ( ! @available )
+
+ return unless( @redis )
+
# hostname + test-type
host = @test.target
@@ -71,7 +76,9 @@ module Custodian
# Clear an alert in redis
#
def clear
- return if ( ! @available )
+
+ return unless( @redis )
+
# hostname + test-type
host = @test.target