From 326b2a15e9f9978f085df18fde9351c1af46c800 Mon Sep 17 00:00:00 2001 From: Andrew Kane Date: Mon, 15 Feb 2016 00:54:01 -0800 Subject: [PATCH] Fixed logger errors --- test/test_helper.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/test/test_helper.rb b/test/test_helper.rb index 80e77e8..3c6dd1d 100644 --- a/test/test_helper.rb +++ b/test/test_helper.rb @@ -4,7 +4,6 @@ require "minitest/autorun" require "minitest/pride" require "logger" require "active_support/core_ext" if defined?(NoBrainer) -require "active_support/logger" require "active_support/notifications" ENV["RACK_ENV"] = "test" @@ -12,7 +11,7 @@ ENV["RACK_ENV"] = "test" Minitest::Test = Minitest::Unit::TestCase unless defined?(Minitest::Test) File.delete("elasticsearch.log") if File.exist?("elasticsearch.log") -Searchkick.client.transport.logger = ActiveSupport::Logger.new("elasticsearch.log") +Searchkick.client.transport.logger = Logger.new("elasticsearch.log") Searchkick.search_timeout = 5 puts "Running against Elasticsearch #{Searchkick.server_version}" @@ -20,7 +19,7 @@ puts "Running against Elasticsearch #{Searchkick.server_version}" I18n.config.enforce_available_locales = true ActiveJob::Base.logger = nil if defined?(ActiveJob) -ActiveSupport::LogSubscriber.logger = ActiveSupport::Logger.new(STDOUT) if ENV["NOTIFICATIONS"] +ActiveSupport::LogSubscriber.logger = Logger.new(STDOUT) if ENV["NOTIFICATIONS"] def elasticsearch2? Searchkick.server_version.starts_with?("2.") -- libgit2 0.21.0