Skip to content

Commit

Permalink
make rubocop happy
Browse files Browse the repository at this point in the history
  • Loading branch information
ykitamura-mdsol committed Jan 15, 2024
1 parent e0cdeb8 commit 3cdcbeb
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 11 deletions.
12 changes: 8 additions & 4 deletions .rubocop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,20 @@ AllCops:
#
- 'vendor/bundle/**/*'

Lint/ConstantDefinitionInBlock:
Exclude:
- 'spec/**/*'

Layout/ArgumentAlignment:
EnforcedStyle: with_fixed_indentation

Layout/FirstHashElementIndentation:
EnforcedStyle: consistent

Lint/ConstantDefinitionInBlock:
Exclude:
- 'spec/**/*'

Lint/StructNewOverride:
Exclude:
- spec/lib/lorekeeper/backtrace_cleaner_spec.rb

Metrics/ParameterLists:
CountKeywordArgs: false

Expand Down
6 changes: 3 additions & 3 deletions lib/lorekeeper/json_logger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ def reset_state
# Delegates methods to the existing Logger instance
# We are extending the logger API with methods error_with_data, etc
LOGGING_METHODS.each do |method_name|
define_method "#{method_name}_with_data", ->(message_param = nil, data = {}, &block) {
define_method :"#{method_name}_with_data", ->(message_param = nil, data = {}, &block) {
return true if METHOD_SEVERITY_MAP[method_name] < @level

extra_fields = { DATA => (data || {}) }
extra_fields = { DATA => data || {} }
with_extra_fields(extra_fields) do
add(METHOD_SEVERITY_MAP[method_name], message_param, nil, &block)
end
Expand Down Expand Up @@ -87,7 +87,7 @@ def exception(exception, custom_message = nil, custom_data = nil, custom_level =
else
log_data(METHOD_SEVERITY_MAP[:warn], 'Logger exception called without exception class.')
message = "#{exception.class}: #{exception.inspect} #{param_message}"
with_extra_fields(DATA => (param_data || {})) { log_data(log_level, message) }
with_extra_fields(DATA => param_data || {}) { log_data(log_level, message) }
end
end

Expand Down
2 changes: 1 addition & 1 deletion lib/lorekeeper/simple_logger.rb
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ def inspect

# Extending the logger API with methods error_with_data, etc
LOGGING_METHODS.each do |method_name|
define_method "#{method_name}_with_data", ->(message_param = nil, data = {}) {
define_method :"#{method_name}_with_data", ->(message_param = nil, data = {}) {
return true if METHOD_SEVERITY_MAP[method_name] < @level

log_data(METHOD_SEVERITY_MAP[method_name], "#{message_param}, data: #{data}")
Expand Down
4 changes: 2 additions & 2 deletions spec/lib/lorekeeper/json_logger_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
expect(io.received_message.keys[0..2]).to eq(%w[timestamp message level])
end
it "Outputs the correct format for #{method}_with_data" do
logger.send("#{method}_with_data", message, data)
logger.send(:"#{method}_with_data", message, data)
expect(io.received_message).to eq(expected_data.merge('level' => level_name.call(method)))
end
end
Expand Down Expand Up @@ -396,7 +396,7 @@
end
it "No data is written to the device for #{method}_with_data" do
expect(io).not_to receive(:write)
logger.send("#{method}_with_data", message, data)
logger.send(:"#{method}_with_data", message, data)
end
end
end
Expand Down
2 changes: 1 addition & 1 deletion spec/lib/lorekeeper/multi_logger_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
logger.add_logger(json_logger)

Lorekeeper::FastLogger::LOGGING_METHODS.each do |log_level|
logger.send("#{log_level}_with_data", message, { sum: 123 })
logger.send(:"#{log_level}_with_data", message, { sum: 123 })

expect(io.received_message).to include("#{message}, data: {:sum=>123}")
expect(json_io.received_message).to include(
Expand Down

0 comments on commit 3cdcbeb

Please sign in to comment.