Skip to content

Commit d20494e

Browse files
committed
fix rubocop lint issues
1 parent 6783dfa commit d20494e

File tree

3 files changed

+44
-45
lines changed

3 files changed

+44
-45
lines changed

sentry-ruby/lib/sentry-ruby.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -690,4 +690,4 @@ def dependency_installed?(name)
690690
require "sentry/graphql"
691691
require "sentry/faraday"
692692
require "sentry/excon"
693-
require "sentry/std_lib_logger"
693+
require "sentry/std_lib_logger"
Lines changed: 39 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,44 @@
11
# frozen_string_literal: true
22

33
module Sentry
4-
# Ruby Logger support Add commentMore actions
5-
# intercepts any logger instance and send the log to Sentry too.
6-
module StdLibLogger
7-
8-
SEVERITY_MAP = {
9-
0 => :debug,
10-
1 => :info,
11-
2 => :warn,
12-
3 => :error,
13-
4 => :fatal
14-
}.freeze
15-
16-
def add(severity, message = nil, progname = nil, &block)
17-
super
18-
19-
return unless Sentry.initialized? && Sentry.get_current_hub
20-
21-
# exclude sentry SDK logs -- to prevent recursive log action,
22-
# do not process internal logs again
23-
if message.nil? && progname != Sentry::Logger::PROGNAME
24-
25-
# handle different nature of Ruby Logger class:
26-
# inspo from Sentry::Breadcrumb::SentryLogger
27-
if block_given?
28-
message = yield
29-
else
30-
message = progname
31-
end
32-
33-
message = message.to_s.strip
34-
35-
if !message.nil? && message != Sentry::Logger::PROGNAME && method = SEVERITY_MAP[severity]
36-
Sentry.logger.send(method, message)
37-
end
38-
end
39-
40-
super
41-
end
42-
end
4+
# Ruby Logger support Add commentMore actions
5+
# intercepts any logger instance and send the log to Sentry too.
6+
module StdLibLogger
7+
SEVERITY_MAP = {
8+
0 => :debug,
9+
1 => :info,
10+
2 => :warn,
11+
3 => :error,
12+
4 => :fatal
13+
}.freeze
14+
15+
def add(severity, message = nil, progname = nil, &block)
16+
super
17+
18+
return unless Sentry.initialized? && Sentry.get_current_hub
19+
20+
# exclude sentry SDK logs -- to prevent recursive log action,
21+
# do not process internal logs again
22+
if message.nil? && progname != Sentry::Logger::PROGNAME
23+
24+
# handle different nature of Ruby Logger class:
25+
# inspo from Sentry::Breadcrumb::SentryLogger
26+
if block_given?
27+
message = yield
28+
else
29+
message = progname
30+
end
31+
32+
message = message.to_s.strip
33+
34+
if !message.nil? && message != Sentry::Logger::PROGNAME && method = SEVERITY_MAP[severity]
35+
Sentry.logger.send(method, message)
36+
end
37+
end
38+
39+
super
40+
end
41+
end
4342
end
4443

4544
Sentry.register_patch(:logger) do |config|
@@ -48,4 +47,4 @@ def add(severity, message = nil, progname = nil, &block)
4847
else
4948
Sentry.sdk_logger.warn(":logger patch enabled but `enable_logs` is turned off - skipping applying patch")
5049
end
51-
end
50+
end

sentry-ruby/spec/sentry/std_lib_logger_spec.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
# frozen_string_literal: true
22

33
RSpec.describe Sentry::StdLibLogger do
4-
let(:logger) { ::Logger.new(IO::NULL) }
4+
let(:logger) { ::Logger.new(IO::NULL) }
55

6-
context "when enable_logs is set to true but logger patch is not enabled" do
6+
context "when enable_logs is set to true but logger patch is not enabled" do
77
before do
88
perform_basic_setup do |config|
99
config.enable_logs = true
@@ -13,7 +13,7 @@
1313
it "does not send log using stdlib logger" do
1414
logger.send(:info, "Hello World")
1515

16-
expect(sentry_logs).to be_empty
16+
expect(sentry_logs).to be_empty
1717
end
1818
end
1919

@@ -41,4 +41,4 @@
4141
end
4242
end
4343
end
44-
end
44+
end

0 commit comments

Comments
 (0)