Skip to content

Commit 2902d35

Browse files
authored
Merge pull request reidmorrison#170 from harmdewit/master
fix: require rails subscribers if defined
2 parents 2ff877b + bf77113 commit 2902d35

File tree

1 file changed

+28
-19
lines changed

1 file changed

+28
-19
lines changed

lib/rails_semantic_logger/engine.rb

Lines changed: 28 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
11
require "rails"
2-
require "action_controller/log_subscriber"
3-
require "action_view/log_subscriber"
4-
require "action_mailer/log_subscriber"
52
require "rails_semantic_logger/options"
63

74
module RailsSemanticLogger
@@ -193,26 +190,38 @@ class Engine < ::Rails::Engine
193190
end
194191

195192
# Action View
196-
RailsSemanticLogger::ActionView::LogSubscriber.rendered_log_level = :info if config.rails_semantic_logger.rendered
197-
RailsSemanticLogger.swap_subscriber(
198-
::ActionView::LogSubscriber,
199-
RailsSemanticLogger::ActionView::LogSubscriber,
200-
:action_view
201-
)
193+
if defined?(::ActionView)
194+
require "action_view/log_subscriber"
195+
196+
RailsSemanticLogger::ActionView::LogSubscriber.rendered_log_level = :info if config.rails_semantic_logger.rendered
197+
RailsSemanticLogger.swap_subscriber(
198+
::ActionView::LogSubscriber,
199+
RailsSemanticLogger::ActionView::LogSubscriber,
200+
:action_view
201+
)
202+
end
202203

203204
# Action Controller
204-
RailsSemanticLogger.swap_subscriber(
205-
::ActionController::LogSubscriber,
206-
RailsSemanticLogger::ActionController::LogSubscriber,
207-
:action_controller
208-
)
205+
if defined?(::ActionController)
206+
require "action_controller/log_subscriber"
207+
208+
RailsSemanticLogger.swap_subscriber(
209+
::ActionController::LogSubscriber,
210+
RailsSemanticLogger::ActionController::LogSubscriber,
211+
:action_controller
212+
)
213+
end
209214

210215
# Action Mailer
211-
RailsSemanticLogger.swap_subscriber(
212-
::ActionMailer::LogSubscriber,
213-
RailsSemanticLogger::ActionMailer::LogSubscriber,
214-
:action_mailer
215-
)
216+
if defined?(::ActionMailer)
217+
require "action_mailer/log_subscriber"
218+
219+
RailsSemanticLogger.swap_subscriber(
220+
::ActionMailer::LogSubscriber,
221+
RailsSemanticLogger::ActionMailer::LogSubscriber,
222+
:action_mailer
223+
)
224+
end
216225
end
217226

218227
#

0 commit comments

Comments
 (0)