Fix groups vars.

Fixes ytti/oxidized#242.
Fixes ytti/oxidized-web#38.
Added a check to verify the key exists for a group before returning.
Might fic a group issue in ytti/oxidized#171.

1 files changed, 7 insertions, 2 deletions

diff --git a/lib/oxidized/config/vars.rb b/lib/oxidized/config/vars.rb
index b39e7fe..b0471f2 100644
--- a/lib/oxidized/config/vars.rb
+++ b/lib/oxidized/config/vars.rb
@@ -2,9 +2,14 @@ module Oxidized::Config::Vars
   # convenience method for accessing node, group or global level user variables
   # nil values will be ignored
   def vars name
-    r =   @node.vars[name] unless @node.vars.nil?
-    r ||= Oxidized::CFG.groups[@node.group].vars[name.to_s] if Oxidized::CFG.groups.has_key?(@node.group)
+    r = @node.vars[name] unless @node.vars.nil?
+    if Oxidized::CFG.groups.has_key?(@node.group)
+      if Oxidized::CFG.groups[@node.group].vars.has_key?(name.to_s)
+        r ||= Oxidized::CFG.groups[@node.group].vars[name.to_s]
+      end
+    end
     r ||= Oxidized::CFG.vars[name.to_s] if Oxidized::CFG.vars.has_key?(name.to_s)
     r
   end
 end
+