Skip to content

Commit 1196c11

Browse files
committed
Fix for proper compatibility with Rails initializers
1 parent 548d0d2 commit 1196c11

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed

lib/rails/graphql/railtie.rb

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,9 @@ class Railtie < Rails::Railtie
2929
# Ensure a valid logger
3030
initializer 'graphql.logger' do |app|
3131
ActiveSupport.on_load(:graphql) do
32-
return if config.logger.present?
33-
34-
logger = ::Rails.logger
35-
if logger.respond_to?(:tagged)
36-
config.logger = logger
37-
else
38-
config.logger = ActiveSupport::TaggedLogging.new(logger)
32+
config.logger ||= begin
33+
logger = ::Rails.logger
34+
logger.respond_to?(:tagged) ? logger : ActiveSupport::TaggedLogging.new(logger)
3935
end
4036
end
4137
end

lib/rails/graphql/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ def self.version
1414
module VERSION
1515
MAJOR = 1
1616
MINOR = 0
17-
TINY = 2
17+
TINY = 3
1818
PRE = nil
1919

2020
STRING = [MAJOR, MINOR, TINY, PRE].compact.join('.')

0 commit comments

Comments
 (0)