Skip to content
Open
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: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

### Unreleased

* (patch) Fix `KnapsackPro.logger` building a new logger and reopening the log file on every call when `KNAPSACK_PRO_LOG_DIR` is set.

### 10.0.1

* Add support for [File Paths Encryption](https://docs.knapsackpro.com/ruby/encryption/) to [Retry only Failures](https://docs.knapsackpro.com/ruby/retry-only-failures/).
Expand Down
20 changes: 10 additions & 10 deletions lib/knapsack_pro.rb
Original file line number Diff line number Diff line change
Expand Up @@ -110,17 +110,17 @@ def root
end

def logger
if KnapsackPro::Config::Env.log_dir
default_logger = Logger.new("#{KnapsackPro::Config::Env.log_dir}/knapsack_pro_node_#{KnapsackPro::Config::Env.ci_node_index}.log")
default_logger.level = KnapsackPro::Config::Env.log_level
self.logger = default_logger
end
return @logger if @logger

unless @logger
default_logger = ::Logger.new(stdout)
default_logger.level = KnapsackPro::Config::Env.log_level
self.logger = default_logger
end
log_dir = KnapsackPro::Config::Env.log_dir
default_logger =
if log_dir
::Logger.new("#{log_dir}/knapsack_pro_node_#{KnapsackPro::Config::Env.ci_node_index}.log")
else
::Logger.new(stdout)
end
default_logger.level = KnapsackPro::Config::Env.log_level
self.logger = default_logger

@logger
end
Expand Down
13 changes: 13 additions & 0 deletions spec/knapsack_pro_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,19 @@
end
end
end

it 'reuses the logger instead of reopening the log file on every call' do
Dir.mktmpdir do |dir|
stub_const('ENV', 'KNAPSACK_PRO_LOG_DIR' => dir)

expect(::Logger).to receive(:new).once.and_call_original

logger = described_class.logger

expect(described_class.logger).to be(logger)
expect(described_class.logger).to be(logger)
end
end
end

context 'with the default logger' do
Expand Down