bin/ganymed in ganymed-0.5.1 vs bin/ganymed in ganymed-0.5.2

- old
+ new

@@ -3,23 +3,18 @@ require 'rubygems' $:.unshift(File.join(File.expand_path("../..", __FILE__), 'lib')) $0 = "ganymed" -require 'madvertise/ext/environment' +require 'madvertise/boot' Env.key = 'GANYMED_ENV' require 'ganymed/master' cli = Ganymed::Master::CLI.parse_options -require 'madvertise-logging' -$log = ImprovedLogger.new(cli.config[:log_backend].to_sym, $0) -$log.level = :debug if cli.config[:debug] - -$config ||= Configuration.new do |config| - config.mixin(File.join(Ganymed::LIB_DIR, 'ganymed/config.yml')) - config.mixin(cli.config[:config_file]) if cli.config[:config_file] -end +$config = Configuration.new +$config.mixin(File.join(Ganymed::LIB_DIR, 'ganymed/config.yml')) +$config.mixin(cli.config[:config_file]) if cli.config[:config_file] if Env.prod? Madvertise::Logging::ImprovedLogger::Formatter. format = "<%{syslog_severity}>%{msg}\n" end