Permalink
Browse files

load defaults also in job-processor lib

  • Loading branch information...
rekado committed Oct 20, 2014
1 parent f37de9e commit c87824ed88c8eec2d4d3172f71ab8d82209e630f
Showing with 3 additions and 1 deletion.
  1. +3 −1 lib/libertree/job-processor.rb
@@ -10,7 +10,9 @@ class JobProcessor
def initialize(config_filename)
@config_filename = config_filename
@conf = YAML.load( File.read(config_filename) )
# load defaults first, then merge
@conf = YAML.load(File.read("#{File.dirname( __FILE__ ) }/../../defaults.yaml")).
merge YAML.load(File.read(config_filename))
# initialise own domain (used for local member handles)
Libertree::Model::Server.own_domain = @conf['domain']

0 comments on commit c87824e

Please sign in to comment.