hiera-redis 0.2.1 → 0.2.2

data/lib/hiera/backend/redis_backend.rb

@@ -2,7 +2,7 @@ class Hiera
   module Backend
     class Redis_backend
 
-      VERSION="0.2.1"
+      VERSION="0.2.2"
 
       attr_reader :redis
 
@@ -16,10 +16,13 @@ class Hiera
         
         # config overrides default values
         options.each_key do |k|
-          options[k] = Config[:redis][k] if Config[:redis].has_key?(k)
+          options[k] = Config[:redis][k] if Config[:redis].is_a?(Hash) && Config[:redis].has_key?(k)
         end
 
         @redis = Redis.new(options)
+
+        @soft_connection_failure = false  # Thus we are preventing the current behaviour
+        @soft_connection_failure = Config[:redis][:soft_connection_failure] if Config[:redis].is_a?(Hash) && Config[:redis].has_key?(:soft_connection_failure)
       end
 
       def redis_query(args = {})
@@ -27,25 +30,31 @@ class Hiera
         # convert our seperator in order to maintain yaml compatibility
         redis_key = args[:source].gsub('/', ':')
 
-        if redis.type(redis_key) == "hash"
-          redis.hget(redis_key, args[:key])
-        else
-          redis_key << ":#{args[:key]}"
-          case redis.type(redis_key)
-          when "set"
-            redis.smembers(redis_key)
-          when "hash"
-            redis.hgetall(redis_key)
-          when "list"
-            redis.lrange(redis_key, 0, -1)
-          when "string"
-            redis.get(redis_key)
-          when "zset"
-            redis.zrange(redis_key, 0, -1)
+        begin
+          if redis.type(redis_key) == "hash"
+            redis.hget(redis_key, args[:key])
           else
-            Hiera.debug("No such key: #{redis_key}")
-            nil
+            redis_key << ":#{args[:key]}"
+            case redis.type(redis_key)
+            when "set"
+              redis.smembers(redis_key)
+            when "hash"
+              redis.hgetall(redis_key)
+            when "list"
+              redis.lrange(redis_key, 0, -1)
+            when "string"
+              redis.get(redis_key)
+            when "zset"
+              redis.zrange(redis_key, 0, -1)
+            else
+              Hiera.debug("No such key: #{redis_key}")
+              nil
+            end
           end
+        rescue Redis::CannotConnectError => e
+          raise e unless @soft_connection_failure
+          Hiera.warn("Cannot connect to Redis server")
+          nil
         end
       end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hiera-redis
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Adam Kosmin c/o Reliant Security, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-30 00:00:00 Z
+date: 2012-07-23 00:00:00 Z
 dependencies: []
 
 description: Allows hiera functions to pull data from a Redis database.