Log to stdout with VERBOSE flag [skip ci]

Andrew
1 parent 6a83c3a5
Showing 2 changed files with 2 additions and 6 deletions Show diff stats
test/support/activerecord.rb
test/test_helper.rb
 require "active_record"
  
 # for debugging
-ActiveRecord::Base.logger = Logger.new(STDOUT) if ENV["VERBOSE"]
+ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
  
 # rails does this in activerecord/lib/active_record/railtie.rb
 ActiveRecord::Base.default_timezone = :utc
@@ -10,11 +10,7 @@ Searchkick.index_suffix = ENV[&quot;TEST_ENV_NUMBER&quot;]
  
 ENV["RACK_ENV"] = "test"
  
-if !defined?(ParallelTests) || ParallelTests.first_process?
-  File.delete("elasticsearch.log") if File.exist?("elasticsearch.log")
-end
-
-Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
+Searchkick.client.transport.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
 Searchkick.search_timeout = 5
  
 if defined?(Redis)
1	1	require "active_record"
2	2
3	3	# for debugging
4		-ActiveRecord::Base.logger = Logger.new(STDOUT) if ENV["VERBOSE"]
	4	+ActiveRecord::Base.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
5	5
6	6	# rails does this in activerecord/lib/active_record/railtie.rb
7	7	ActiveRecord::Base.default_timezone = :utc
...	...
...	...	@@ -10,11 +10,7 @@ Searchkick.index_suffix = ENV["TEST_ENV_NUMBER"]
10	10
11	11	ENV["RACK_ENV"] = "test"
12	12
13		-if !defined?(ParallelTests) \|\| ParallelTests.first_process?
14		- File.delete("elasticsearch.log") if File.exist?("elasticsearch.log")
15		-end
16		-
17		-Searchkick.client.transport.logger = Logger.new("elasticsearch.log")
	13	+Searchkick.client.transport.logger = ActiveSupport::Logger.new(STDOUT) if ENV["VERBOSE"]
18	14	Searchkick.search_timeout = 5
19	15
20	16	if defined?(Redis)
...	...