lib/td/logger/agent/rails/config.rb in td-logger-0.3.4 vs lib/td/logger/agent/rails/config.rb in td-logger-0.3.5

@@ -44,11 +44,11 @@
     def access_log_enabled?
       !@access_log_table.nil? && !@access_log_table.empty?
     end
 
     def self.init
-      logger = ::Rails.logger || ::Logger.new(STDERR)
+      logger = ::Logger.new(STDERR)
       if File.exist?("#{::Rails.root}/#{CONFIG_PATH}")
         load_file(logger)
       else
         load_env(logger)
       end
@@ -66,10 +66,10 @@
         logger.warn "Can't load #{CONFIG_PATH} file: #{$!}"
         logger.warn "Disabling Treasure Data event logger."
         return nil
       end
 
-      conf = env_conf[::Rails.env]
+      conf = env_conf[::Rails.env] if conf.is_a?(Hash)
       unless conf
         logger.warn "#{CONFIG_PATH} doesn't include setting for current environment (#{::Rails.env})."
         logger.warn "Disabling Treasure Data event logger."
         return nil
       end