Merge pull request #395 from cyberious/FM-2130

FM-2130 Move cache file to non temp directory
This commit is contained in:
Hunter Haugen 2015-01-13 17:03:44 -08:00
commit 8db1f2e2f0

View file

@ -15,7 +15,7 @@
class Facter::Util::DotD
require 'yaml'
def initialize(dir="/etc/facts.d", cache_file="/tmp/facts_cache.yml")
def initialize(dir="/etc/facts.d", cache_file=File.join(Puppet[:libdir], "facts_dot_d.cache"))
@dir = dir
@cache_file = cache_file
@cache = nil
@ -23,7 +23,7 @@ class Facter::Util::DotD
end
def entries
Dir.entries(@dir).reject{|f| f =~ /^\.|\.ttl$/}.sort.map {|f| File.join(@dir, f) }
Dir.entries(@dir).reject { |f| f =~ /^\.|\.ttl$/ }.sort.map { |f| File.join(@dir, f) }
rescue
[]
end
@ -113,7 +113,7 @@ class Facter::Util::DotD
def cache_save!
cache = load_cache
File.open(@cache_file, "w", 0600) {|f| f.write(YAML.dump(cache)) }
File.open(@cache_file, "w", 0600) { |f| f.write(YAML.dump(cache)) }
rescue
end