boot.rb in madvertise-ext-0.6.0

- old
+ new

@@ -1,7 +1,13 @@
 # encoding: utf-8
 
+begin
+  require 'jbundler'
+rescue LoadError
+  # do nothing
+end
+
 # load a bunch of common classes here, so we don't have to track and repeat it
 # everywhere
 require 'active_support/all'
 require 'cgi'
 require 'date'
@@ -12,19 +18,29 @@
 # load all madvertise extensions
 Dir[File.join(File.dirname(__FILE__), 'ext', '*.rb')].each do |f|
   require f
 end
 
+blacklist = [
+  'tasks.rb',
+  'gc_stats.rb',
+  'sysconf.rb',
+  'proc_stat.rb',
+]
+
 Dir[File.join(File.dirname(__FILE__), '*.rb')].each do |f|
-  require f
+  require f unless blacklist.include?(f)
 end
 
 require 'madvertise/logging' # dedicated gem
 
-# initialize configuration and logger with hardcoded defaults
+# load default configuration
 $conf = Conf = Configuration.new
+
+# callback for madvertise-logging
 $conf.callback 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
 end