hiera_zookeeper 0.2.2 → 0.2.3

data/lib/hiera/backend/zookeeper_backend.rb

@@ -2,12 +2,30 @@ class Hiera
   module Backend
     class Zookeeper_backend
       # ZooKeeper backend for Hiera. Recognizes :server and :datadir config options. If no :server is specified, uses localhost:2181.
-      # The node data is expected to be in YAML.
+      # The node data is expected to be in YAML or JSON (YAML is the default).
 
       def initialize
         require 'rubygems'
-        require 'yaml'
         require 'zookeeper'
+        # Set default values
+        Config[:zookeeper] = Hash.new() if Config[:zookeeper].nil?
+        Config[:zookeeper][:timeout] = 1 if Config[:zookeeper][:timeout].nil?
+        Config[:zookeeper][:datadir] = '/hiera' if Config[:zookeeper][:datadir].nil? 
+        Config[:zookeeper][:format] = 'yaml' if Config[:zookeeper][:format].nil?
+        Config[:zookeeper][:format].downcase!
+        if Config[:zookeeper][:server].nil? then
+          Config[:zookeeper][:servers] = ['localhost:2181'] if Config[:zookeeper][:servers].nil?
+        else
+          Hiera.warn("The :server option is deprecated.  Use :servers.  Option :server will go away very soon.") 
+          Config[:zookeeper][:servers] = Config[:zookeeper][:server]
+        end
+
+        case Config[:zookeeper][:format]
+        when 'json'
+          require 'json'
+        else
+          require 'yaml'
+        end
 
         Hiera.debug("Hiera ZooKeeper backend starting")
       end
@@ -17,29 +35,15 @@ class Hiera
         Hiera.debug("Looking up #{key} in ZooKeeper backend")
         # Establish server(s) to check
         servers = []
-        unless Config[:zookeeper].nil? or Config[:zookeeper][:server].nil? then
-          if Config[:zookeeper][:server].kind_of?(Array) then
-            Config[:zookeeper][:server].shuffle!
-            Config[:zookeeper][:server].each do |server|
-              servers.push(Backend.parse_string(server, scope))
-            end
-          else
-            servers.push(Backend.parse_string(Config[:zookeeper][:server], scope))
-          end
-        else
-          servers.push('localhost:2181')
-        end 
-        # Establish connection timeout
-        if Config[:zookeeper].nil? or Config[:zookeeper][:timeout].nil? then
-          timeout = 1
-        else
-          timeout = Config[:zookeeper][:timeout]
+        Config[:zookeeper][:servers].shuffle!
+        Config[:zookeeper][:servers].each do |s|
+          servers.push(Backend.parse_string(s, scope))
         end
         # Establish connection
         zk = nil
         servers.each do |s|
           begin 
-            zk = Zookeeper.new(s, timeout)
+            zk = Zookeeper.new(s, Config[:zookeeper][:timeout])
             break if zk.connected?
           rescue => e
             Hiera.debug(e.message)
@@ -48,34 +52,35 @@ class Hiera
         end
         # If it did not work, raise that exception!
         if zk.nil? or not zk.connected? then
-          raise(ZookeeperExceptions::ZookeeperException, "Could not connect to any server in configuration")
+          raise(ZookeeperExceptions::ZookeeperException, "Could not connect to any zookeeper server in configuration")
         end
 
         Backend.datasources(scope, order_override) do |source|
           Hiera.debug("Looking for data source #{source}")
-          # Determine the zookeeper path(s) to get data from
-          unless Config[:zookeeper].nil? or Config[:zookeeper][:datadir].nil? then
-            datadir = "#{Backend.datadir(Config[:zookeeper][:datadir], scope)}/#{source}"
-          else
-            datadir = "/hiera/#{source}"
-          end
+          # Determine the zookeeper path to get data from
+          datadir = "#{Backend.parse_string(Config[:zookeeper][:datadir], scope)}/#{source}"
           data = zk.get(:path => "#{datadir}/#{key}")
           if data[:stat].exists then
             Hiera.debug("Found #{key} in #{source}")
-            new_answer = Backend.resolve_answer(YAML.load(data[:data]), resolution_type)
-          end
-          case resolution_type
-          when :array
-            raise(Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}") unless new_answer.kind_of?(Array) or new_answer.kind_of?(String)
-            answer ||= []
-            answer << new_answer
-          when :hash
-            raise(Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}") unless new_answer.kind_of?(Hash)
-            answer ||= {}
-            answer = new_answer.merge(answer)
-          else
-            answer = new_answer
-            break
+            case Config[:zookeeper][:format]
+            when 'json'
+              new_answer = Backend.resolve_answer(JSON.load(data[:data]), resolution_type)
+            else
+              new_answer = Backend.resolve_answer(YAML.load(data[:data]), resolution_type)
+            end
+            case resolution_type
+            when :array
+              raise(Exception, "Hiera type mismatch: expected Array and got #{new_answer.class}") unless new_answer.kind_of?(Array) or new_answer.kind_of?(String)
+              answer ||= []
+              answer << new_answer
+            when :hash
+              raise(Exception, "Hiera type mismatch: expected Hash and got #{new_answer.class}") unless new_answer.kind_of?(Hash)
+              answer ||= {}
+              answer = new_answer.merge(answer)
+            else
+              answer = new_answer
+              break
+            end
           end
         end
         zk.close if not zk.nil? and zk.connected?

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: hiera_zookeeper
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 0
   - 2
-  - 2
-  version: 0.2.2
+  - 3
+  version: 0.2.3
 platform: ruby
 authors: 
 - zahna
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-09-25 00:00:00 Z
+date: 2012-09-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: hiera