summaryrefslogtreecommitdiff
path: root/lib/oxidized/config/core.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/oxidized/config/core.rb')
-rw-r--r--lib/oxidized/config/core.rb9
1 files changed, 7 insertions, 2 deletions
diff --git a/lib/oxidized/config/core.rb b/lib/oxidized/config/core.rb
index c2cde58..9b93d91 100644
--- a/lib/oxidized/config/core.rb
+++ b/lib/oxidized/config/core.rb
@@ -11,17 +11,22 @@ module Oxidized
# load config from file or bootstrap with built-ins
def load
if File.exists? @file
- marshal_load YAML.load_file @file
+ cfg = YAML.load_file @file
+ marshal_load self.to_h.merge(cfg)
else
- require 'oxidized/config/bootstrap'
+ save
end
end
+ def defaults
+ require 'oxidized/config/bootstrap'
+ end
# save config to file
def save
File.write @file, YAML.dump(marshal_dump)
end
end
CFG = Config.new
+ CFG.defaults
CFG.load
Log.file = CFG.log if CFG.log
Log.level = Logger::INFO unless CFG.debug