aboutsummaryrefslogtreecommitdiff
path: root/bin/mauveconsole
diff options
context:
space:
mode:
Diffstat (limited to 'bin/mauveconsole')
-rw-r--r--bin/mauveconsole5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/mauveconsole b/bin/mauveconsole
index 169ca54..211eaab 100644
--- a/bin/mauveconsole
+++ b/bin/mauveconsole
@@ -89,7 +89,6 @@ require 'pp'
def error(msg)
logger = Log4r::Logger['Mauve']
- logger.error
logger.error "*** Error: #{msg}"
logger.error "*** For help, type: #{$0} -h"
@@ -139,7 +138,9 @@ module Mauve
end
begin
- Mauve::Configuration.current = Mauve::ConfigurationBuilder.load(configuration_file)
+ builder = Mauve::ConfigurationBuilder.new
+ builder.include_file(configuration_file)
+ Mauve::Configuration.current = builder.result
Mauve::Server.instance.setup
rescue StandardError => ex
error ex