lib/madvertise/boot.rb in madvertise-ext-0.6.2 vs lib/madvertise/boot.rb in madvertise-ext-0.6.3

@@ -12,10 +12,11 @@
 require 'cgi'
 require 'date'
 require 'json'
 require 'servolux'
 require 'socket'
+require 'madvertise-logging'
 
 # load all madvertise extensions
 Dir[File.join(File.dirname(__FILE__), 'ext', '*.rb')].each do |f|
   require f
 end
@@ -29,22 +30,40 @@
 
 Dir[File.join(File.dirname(__FILE__), '*.rb')].each do |f|
   require f unless blacklist.include?(File.basename(f))
 end
 
-require 'madvertise/logging' # dedicated gem
-
 # load default configuration
 $conf = Configuration.new
 
-# callback for madvertise-logging
-$conf.callback do
-  ImprovedLogger::Formatter.format = $conf.log_format
-  ImprovedLogger::Formatter.log4j_format = $conf.log4j_format
+# configuration-reloading callbacks
+reload_logger = ->(conf) do
+  ImprovedLogger::Formatter.format = conf.log_format
+  ImprovedLogger::Formatter.log4j_format = conf.log4j_format
+
   $log = MultiLogger.new
-  $log.attach(ImprovedLogger.new($conf.log_backend.to_sym, File.basename($0)))
-  $log.level = $conf.log_level.downcase.to_sym
-  $log.log_caller = $conf.log_caller
+  $log.attach(ImprovedLogger.new(conf.log_backend.to_sym, File.basename($0)))
+  $log.level = conf.log_level.downcase.to_sym
+  $log.log_caller = conf.log_caller
 end
 
-# trigger log callback with defaults
+reload_mixins = ->(conf) do
+  if defined?(ROOT)
+    config_yml = File.join(ROOT, 'config.yml')
+    conf.mixin(config_yml)
+
+    dot_user = File.join(ROOT, '.user')
+
+    if File.exists?(dot_user)
+      File.readlines(dot_user).each do |line|
+        user_yml = File.join(ROOT, 'config', 'mixins', "#{line.chomp}.yml")
+        conf.mixin(user_yml)
+      end
+    end
+  end
+end
+
+# reload configuration, trigger callbacks
+$conf.callback(&reload_logger)
+$conf.callback(&reload_mixins)
+
 $conf.reload!