Skip to content

Commit b97ae8d

Browse files
committed
Adding wrapped_app to log_to_stdout
since it was preventing all the middleware callbacks from running. Mock out Mongoid log level setting so that :trace level works. Hack out Rails tagged logging and broadcasting since Semantic Logger already does that.
1 parent f9f9f9c commit b97ae8d

File tree

6 files changed

+50
-1
lines changed

6 files changed

+50
-1
lines changed

lib/rails_semantic_logger.rb

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,11 @@ def self.subscriber_patterns(subscriber)
5252

5353
private_class_method :subscriber_patterns, :unattach
5454
end
55+
56+
if defined?(Mongoid)
57+
require("rails_semantic_logger/extensions/mongoid/config")
58+
end
59+
60+
if defined?(ActiveSupport::Logger)
61+
require("rails_semantic_logger/extensions/active_support/logger")
62+
end
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
require "active_support/logger"
2+
3+
module ActiveSupport
4+
# More hacks to try and stop Rails from being it's own worst enemy.
5+
class Logger
6+
# Prevent Console from trying to merge loggers
7+
def self.logger_outputs_to?(*args)
8+
true
9+
end
10+
11+
# Prevent broadcasting since SemanticLogger already supports multiple loggers
12+
def self.broadcast(logger)
13+
Module.new
14+
end
15+
16+
def self.new(*args, **kwargs)
17+
SemanticLogger[self]
18+
end
19+
end
20+
end
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
module ActiveSupport
2+
module TaggedLogging
3+
# Semantic Logger already does tagged logging
4+
def self.new(logger)
5+
logger
6+
end
7+
end
8+
end
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
require "mongoid/config"
2+
3+
module Mongoid
4+
module Config
5+
private
6+
7+
# Remove log overrides
8+
def set_log_levels
9+
end
10+
end
11+
end

lib/rails_semantic_logger/extensions/rails/server.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ class Server
55
private
66

77
def log_to_stdout
8+
wrapped_app # touch the app so the logger is set up
9+
810
SemanticLogger.add_appender(io: $stdout, formatter: :color)
911
end
1012
end

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.5.1".freeze
2+
VERSION = "4.6.0".freeze
33
end

0 commit comments

Comments
 (0)