lib/zabbixapi/basic/basic_func.rb in zabbixapi-0.5.1b13 vs lib/zabbixapi/basic/basic_func.rb in zabbixapi-0.5.1b14
- old
+ new
@@ -8,12 +8,12 @@
def hash_equals?(a, b)
a_new = normalize_hash(a)
b_new = normalize_hash(b)
hash1 = a_new.merge(b_new)
hash2 = b_new.merge(a_new)
- log("hash1 == #{hash1}")
- log("hash2 == #{hash2}")
+ #log("hash1 == #{hash1}")
+ #log("hash2 == #{hash2}")
hash1 == hash2
end
def symbolize_keys(obj)
return obj.inject({}){|memo,(k,v)| memo[k.to_sym] = symbolize_keys(v); memo} if obj.is_a? Hash
@@ -21,15 +21,16 @@
obj
end
def normalize_hash(hash)
result = hash.dup
+ result.delete(:hostid)
result.each do |key, value|
case value
- when Hash
- result[key] = value.to_s
when Array
result.delete(key)
+ else
+ result[key] = value.to_s
end
end
result
end