Skip to content

Commit 76b32d7

Browse files
committed
Prepare for Semantic Logger v5
1 parent d8d1489 commit 76b32d7

File tree

9 files changed

+22
-20
lines changed

9 files changed

+22
-20
lines changed

Gemfile

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ gem "sprockets", "< 4.0"
1414
gem "rails", "~> 6.1.0"
1515
gem "sqlite3", "~> 1.4.0", platform: :ruby
1616

17+
gem 'semantic_logger', github: 'reidmorrison/semantic_logger'
18+
1719
group :development do
1820
gem "rubocop"
1921
end

gemfiles/rails_5.1.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ gem "minitest"
1010
gem "rake"
1111
gem "sprockets", "< 4.0"
1212
gem "rails", "~> 5.1.5"
13-
gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
1413
gem "sqlite3", "~> 1.3.0", platform: :ruby
15-
gem "jdbc-sqlite3", platform: :jruby
14+
gem "semantic_logger", github: "reidmorrison/semantic_logger"
15+
gem "activerecord-jdbcsqlite3-adapter", "~> 51.0", platform: :jruby
1616

1717
group :development do
1818
gem "rubocop"

gemfiles/rails_5.2.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ gem "minitest"
1010
gem "rake"
1111
gem "sprockets", "< 4.0"
1212
gem "rails", "~> 5.2.0"
13-
gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby
1413
gem "sqlite3", "~> 1.3.0", platform: :ruby
15-
gem "jdbc-sqlite3", platform: :jruby
14+
gem "semantic_logger", github: "reidmorrison/semantic_logger"
15+
gem "activerecord-jdbcsqlite3-adapter", "~> 52.0", platform: :jruby
1616

1717
group :development do
1818
gem "rubocop"

gemfiles/rails_6.0.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ gem "minitest"
1010
gem "rake"
1111
gem "sprockets", "< 4.0"
1212
gem "rails", "~> 6.0.0"
13-
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby
1413
gem "sqlite3", "~> 1.4.0", platform: :ruby
15-
gem "jdbc-sqlite3", platform: :jruby
14+
gem "semantic_logger", github: "reidmorrison/semantic_logger"
15+
gem "activerecord-jdbcsqlite3-adapter", "~> 60.0", platform: :jruby
1616

1717
group :development do
1818
gem "rubocop"

gemfiles/rails_6.1.gemfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ gem "minitest"
1010
gem "rake"
1111
gem "sprockets", "< 4.0"
1212
gem "rails", "~> 6.1.0"
13-
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platform: :jruby
1413
gem "sqlite3", "~> 1.4.0", platform: :ruby
15-
gem "jdbc-sqlite3", platform: :jruby
14+
gem "semantic_logger", github: "reidmorrison/semantic_logger"
15+
gem "activerecord-jdbcsqlite3-adapter", "~> 61.0", platform: :jruby
1616

1717
group :development do
1818
gem "rubocop"

lib/rails_semantic_logger/engine.rb

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -55,16 +55,16 @@ class Engine < ::Rails::Engine
5555
formatter = {color: {ap: ap_options}} if (formatter == :default) && (config.colorize_logging != false)
5656

5757
# Set internal logger to log to file only, in case another appender experiences errors during writes
58-
appender = SemanticLogger::Appender::File.new(
59-
file_name: path,
60-
level: config.log_level,
61-
formatter: formatter
62-
)
58+
appender = SemanticLogger::Appender::File.new(path, formatter: formatter)
6359
appender.name = "SemanticLogger"
6460
SemanticLogger::Processor.logger = appender
6561

6662
# Check for previous file or stdout loggers
67-
SemanticLogger.appenders.each { |app| app.formatter = formatter if app.is_a?(SemanticLogger::Appender::File) }
63+
SemanticLogger.appenders.each do |app|
64+
next unless app.is_a?(SemanticLogger::Appender::File) || app.is_a?(SemanticLogger::Appender::IO)
65+
66+
app.formatter = formatter
67+
end
6868
SemanticLogger.add_appender(file_name: path, formatter: formatter, filter: config.rails_semantic_logger.filter)
6969
end
7070

@@ -73,8 +73,8 @@ class Engine < ::Rails::Engine
7373
# If not able to log to file, log to standard error with warning level only
7474
SemanticLogger.default_level = :warn
7575

76-
SemanticLogger::Processor.logger = SemanticLogger::Appender::File.new(io: STDERR)
77-
SemanticLogger.add_appender(io: STDERR)
76+
SemanticLogger::Processor.logger = SemanticLogger::Appender::IO.new($stderr)
77+
SemanticLogger.add_appender(io: $stderr)
7878

7979
logger = SemanticLogger[Rails]
8080
logger.warn(

lib/rails_semantic_logger/options.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module RailsSemanticLogger
4040
# When Semantic Logger fails to log to an appender it logs the error to an
4141
# internal logger, which by default writes to STDERR.
4242
# Example, change the default internal logger to log to stdout:
43-
# SemanticLogger::Processor.logger = SemanticLogger::Appender::File.new(io: STDOUT, level: :warn)
43+
# SemanticLogger::Processor.logger = SemanticLogger::Appender::IO.new($stdout, level: :warn)
4444
#
4545
# config.rails_semantic_logger.add_file_appender = true
4646
#

lib/rails_semantic_logger/version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module RailsSemanticLogger
2-
VERSION = "4.6.1".freeze
2+
VERSION = "5.0.0".freeze
33
end

rails_semantic_logger.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ Gem::Specification.new do |spec|
1515
spec.license = "Apache-2.0"
1616
spec.required_ruby_version = ">= 2.5"
1717
spec.add_dependency "rack"
18-
spec.add_dependency "railties", ">= 3.2"
19-
spec.add_dependency "semantic_logger", "~> 4.8"
18+
spec.add_dependency "railties", ">= 5.1"
19+
spec.add_dependency "semantic_logger", "~> 5.0"
2020
end

0 commit comments

Comments
 (0)