File tree Expand file tree Collapse file tree 3 files changed +33
-3
lines changed Expand file tree Collapse file tree 3 files changed +33
-3
lines changed Original file line number Diff line number Diff line change 11require 'rails/railtie'
22module ActiveModel
33 class Railtie < Rails ::Railtie
4+ initializer 'active_model_serializers.logger' do
5+ ActiveSupport . on_load ( :action_controller ) do
6+ ActiveModelSerializers . logger = ActionController ::Base . logger
7+ end
8+ end
9+
410 initializer 'generators' do |app |
511 app . load_generators
612 require 'generators/serializer/resource_override'
Original file line number Diff line number Diff line change 1+ require 'logger'
2+ require 'active_model'
3+ require "active_support/railtie"
4+ require 'action_controller'
5+ require "action_controller/railtie"
16module ActiveModelSerializers
7+ mattr_accessor :logger
8+ self . logger = Rails . logger || Logger . new ( IO ::NULL )
9+
210 module_function
311
412 def silence_warnings
@@ -10,9 +18,6 @@ def silence_warnings
1018 end
1119end
1220
13- require 'active_model'
14- require 'action_controller'
15-
1621require 'active_model/serializer'
1722require 'active_model/serializable_resource'
1823require 'active_model/serializer/version'
Original file line number Diff line number Diff line change 1+ require 'test_helper'
2+
3+ class ActiveModelSerializers ::LoggerTest < Minitest ::Test
4+
5+ def test_logger_is_set_to_action_controller_logger_when_initializer_runs
6+ assert_equal ActiveModelSerializers . logger , ActionController ::Base . logger
7+ end
8+
9+ def test_logger_can_be_set
10+ original_logger = ActiveModelSerializers . logger
11+ logger = Logger . new ( STDOUT )
12+
13+ ActiveModelSerializers . logger = logger
14+
15+ assert_equal ActiveModelSerializers . logger , logger
16+ ensure
17+ ActiveModelSerializers . logger = original_logger
18+ end
19+ end
You can’t perform that action at this time.
0 commit comments