Skip to content

Commit

Permalink
Merge pull request #78 from stanhu/sh-fix-formatter-regression
Browse files Browse the repository at this point in the history
Fix formatter regression from Ruby 3.3 Logger fix
  • Loading branch information
tpowell-progress authored Jul 25, 2024
2 parents 0ebf4f1 + 961a74e commit 9544bac
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 1 deletion.
2 changes: 1 addition & 1 deletion lib/mixlib/log/logger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def trace?; @level <= TRACE; end
# Create an instance.
#
def initialize(logdev)
super(nil)
super(nil, formatter: ::Mixlib::Log::Formatter.new)
if logdev
@logdev = LocklessLogDevice.new(logdev)
end
Expand Down
29 changes: 29 additions & 0 deletions spec/mixlib/log/logger_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# Copyright:: Copyright (c) 2024 Chef Software, Inc.
# License:: Apache License, Version 2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

require "spec_helper"

RSpec.describe Mixlib::Log::Logger do
let(:io) { StringIO.new }

subject { described_class.new(io) }

it "logs a info message in text format" do
subject.info("test message")

expect(io.string).to match(/INFO: test message/)
end
end

0 comments on commit 9544bac

Please sign in to comment.