Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/ldclient-rb/config.rb
Original file line number Diff line number Diff line change
Expand Up @@ -458,7 +458,7 @@ def self.default_connect_timeout
# @return [Logger] the Rails logger if in Rails, or a default Logger at WARN level otherwise
#
def self.default_logger
if defined?(Rails) && Rails.respond_to?(:logger)
if defined?(Rails) && Rails.respond_to?(:logger) && Rails.logger
Rails.logger
else
log = ::Logger.new($stdout)
Expand Down
5 changes: 5 additions & 0 deletions spec/config_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,11 @@ module LaunchDarkly
stub_const("Rails", rails)
expect(subject.default_logger).to eq :logger
end
it "uses logger if Rails logger is nil" do
rails = instance_double("Rails", logger: nil)
stub_const("Rails", rails)
expect(subject.default_logger).to be_an_instance_of Logger
end
it "Uses logger if Rails is not available" do
expect(subject.default_logger).to be_an_instance_of Logger
end
Expand Down