diff options
author | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-07-22 16:55:54 +0100 |
---|---|---|
committer | Patrick J Cherry <patrick@bytemark.co.uk> | 2011-07-22 16:55:54 +0100 |
commit | 25b32914b72a5f709eca773f3511cc89c2e710c2 (patch) | |
tree | 4dab9e78e4c6b49220a837b38d463328c05e2983 /bin/mauveconsole | |
parent | 3185e5d746abda1b7f42ecdbd74ec14359fda3bc (diff) | |
parent | fd23821950f0562a8995735105cd31fdc6d55933 (diff) |
merge
Diffstat (limited to 'bin/mauveconsole')
-rwxr-xr-x | bin/mauveconsole | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/bin/mauveconsole b/bin/mauveconsole index d115642..c2d145f 100755 --- a/bin/mauveconsole +++ b/bin/mauveconsole @@ -77,6 +77,8 @@ end require 'irb' require 'thread' +require 'mauve/configuration_builder' +require 'mauve/configuration_builders' require 'mauve/configuration' Thread.abort_on_exception = true @@ -85,6 +87,7 @@ include Mauve begin Configuration.current = ConfigurationBuilder.load(configuration_file) + Server.instance.setup rescue StandardError => ex error ex.message end |