mirror of
https://github.com/discourse/discourse.git
synced 2025-09-06 10:50:21 +08:00
FIX: Ensure 100-logster initializer is run before 101-lograge (#12455)
The logster initializer tries to adds RailsMultisite::Formatter to the STDOUT logger. In production, the lograge initializer then removes the RailsMultisite:Formatter because the JSON log will include the database.e10a74694a
used `Rails.application.reloader.to_prepare` to defer running the 100-logster initializer, which meant it ran **after** 101-lograge. This meant that we were writing JSON logs with a non-json text prefix. The `to_prepare` was added because our freedom-patches are now deferred using `to_prepare`, and some initializers were relying on the freedom patches. However, following1533cbb38b
, we decided to load the RailsMultisite freedom patch without `to_prepare`. Therefore, `005-site_settings` and `100-logster` no longer need to use `to_prepare`. Removing it means that these initializers are back to running in sequential order, and the logging issue will be resolved. The only remaining initializer which depends on freedom patches is `100-i18n`. I've added a comment to explain why.
This commit is contained in:
parent
e3d86c4e35
commit
374ab82dd6
3 changed files with 151 additions and 154 deletions
|
@ -16,8 +16,7 @@ if GlobalSetting.skip_redis?
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
Rails.application.reloader.to_prepare do
|
reload_settings = lambda {
|
||||||
reload_settings = lambda {
|
|
||||||
RailsMultisite::ConnectionManagement.safe_each_connection do
|
RailsMultisite::ConnectionManagement.safe_each_connection do
|
||||||
begin
|
begin
|
||||||
SiteSetting.refresh!
|
SiteSetting.refresh!
|
||||||
|
@ -29,13 +28,12 @@ Rails.application.reloader.to_prepare do
|
||||||
# This will happen when migrating a new database
|
# This will happen when migrating a new database
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
reload_settings.call
|
reload_settings.call
|
||||||
|
|
||||||
if !Rails.configuration.cache_classes
|
if !Rails.configuration.cache_classes
|
||||||
ActiveSupport::Reloader.to_prepare do
|
ActiveSupport::Reloader.to_prepare do
|
||||||
reload_settings.call
|
reload_settings.call
|
||||||
end
|
end
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
|
@ -5,6 +5,7 @@
|
||||||
require 'i18n/backend/discourse_i18n'
|
require 'i18n/backend/discourse_i18n'
|
||||||
require 'i18n/backend/fallback_locale_list'
|
require 'i18n/backend/fallback_locale_list'
|
||||||
|
|
||||||
|
# Requires the `translate_accelerator.rb` freedom patch to be loaded
|
||||||
Rails.application.reloader.to_prepare do
|
Rails.application.reloader.to_prepare do
|
||||||
I18n.backend = I18n::Backend::DiscourseI18n.new
|
I18n.backend = I18n::Backend::DiscourseI18n.new
|
||||||
I18n.fallbacks = I18n::Backend::FallbackLocaleList.new
|
I18n.fallbacks = I18n::Backend::FallbackLocaleList.new
|
||||||
|
|
|
@ -9,17 +9,16 @@ if GlobalSetting.skip_redis?
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
Rails.application.reloader.to_prepare do
|
if Rails.env.development? && RUBY_VERSION.match?(/^2\.5\.[23]/)
|
||||||
if Rails.env.development? && RUBY_VERSION.match?(/^2\.5\.[23]/)
|
|
||||||
STDERR.puts "WARNING: Discourse development environment runs slower on Ruby 2.5.3 or below"
|
STDERR.puts "WARNING: Discourse development environment runs slower on Ruby 2.5.3 or below"
|
||||||
STDERR.puts "We recommend you upgrade to Ruby 2.6.1 for the optimal development performance"
|
STDERR.puts "We recommend you upgrade to Ruby 2.6.1 for the optimal development performance"
|
||||||
|
|
||||||
# we have to used to older and slower version of the logger cause the new one exposes a Ruby bug in
|
# we have to used to older and slower version of the logger cause the new one exposes a Ruby bug in
|
||||||
# the Queue class which causes segmentation faults
|
# the Queue class which causes segmentation faults
|
||||||
Logster::Scheduler.disable
|
Logster::Scheduler.disable
|
||||||
end
|
end
|
||||||
|
|
||||||
if Rails.env.development? && !Sidekiq.server? && ENV["RAILS_LOGS_STDOUT"] == "1"
|
if Rails.env.development? && !Sidekiq.server? && ENV["RAILS_LOGS_STDOUT"] == "1"
|
||||||
console = ActiveSupport::Logger.new(STDOUT)
|
console = ActiveSupport::Logger.new(STDOUT)
|
||||||
original_logger = Rails.logger.chained.first
|
original_logger = Rails.logger.chained.first
|
||||||
console.formatter = original_logger.formatter
|
console.formatter = original_logger.formatter
|
||||||
|
@ -28,9 +27,9 @@ Rails.application.reloader.to_prepare do
|
||||||
unless ActiveSupport::Logger.logger_outputs_to?(original_logger, STDOUT)
|
unless ActiveSupport::Logger.logger_outputs_to?(original_logger, STDOUT)
|
||||||
original_logger.extend(ActiveSupport::Logger.broadcast(console))
|
original_logger.extend(ActiveSupport::Logger.broadcast(console))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if Rails.env.production?
|
if Rails.env.production?
|
||||||
Logster.store.ignore = [
|
Logster.store.ignore = [
|
||||||
# honestly, Rails should not be logging this, its real noisy
|
# honestly, Rails should not be logging this, its real noisy
|
||||||
/^ActionController::RoutingError \(No route matches/,
|
/^ActionController::RoutingError \(No route matches/,
|
||||||
|
@ -82,24 +81,24 @@ Rails.application.reloader.to_prepare do
|
||||||
/^Creating scope :open\. Overwriting existing method Poll\.open\./,
|
/^Creating scope :open\. Overwriting existing method Poll\.open\./,
|
||||||
]
|
]
|
||||||
Logster.config.env_expandable_keys.push(:hostname, :problem_db)
|
Logster.config.env_expandable_keys.push(:hostname, :problem_db)
|
||||||
end
|
end
|
||||||
|
|
||||||
Logster.store.max_backlog = GlobalSetting.max_logster_logs
|
Logster.store.max_backlog = GlobalSetting.max_logster_logs
|
||||||
|
|
||||||
# TODO logster should be able to do this automatically
|
# TODO logster should be able to do this automatically
|
||||||
Logster.config.subdirectory = "#{GlobalSetting.relative_url_root}/logs"
|
Logster.config.subdirectory = "#{GlobalSetting.relative_url_root}/logs"
|
||||||
|
|
||||||
Logster.config.application_version = Discourse.git_version
|
Logster.config.application_version = Discourse.git_version
|
||||||
Logster.config.enable_custom_patterns_via_ui = true
|
Logster.config.enable_custom_patterns_via_ui = true
|
||||||
Logster.config.enable_js_error_reporting = GlobalSetting.enable_js_error_reporting
|
Logster.config.enable_js_error_reporting = GlobalSetting.enable_js_error_reporting
|
||||||
|
|
||||||
store = Logster.store
|
store = Logster.store
|
||||||
redis = Logster.store.redis
|
redis = Logster.store.redis
|
||||||
store.redis_prefix = Proc.new { redis.namespace }
|
store.redis_prefix = Proc.new { redis.namespace }
|
||||||
store.redis_raw_connection = redis.without_namespace
|
store.redis_raw_connection = redis.without_namespace
|
||||||
severities = [Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN]
|
severities = [Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN]
|
||||||
|
|
||||||
RailsMultisite::ConnectionManagement.each_connection do
|
RailsMultisite::ConnectionManagement.each_connection do
|
||||||
error_rate_per_minute = SiteSetting.alert_admins_if_errors_per_minute rescue 0
|
error_rate_per_minute = SiteSetting.alert_admins_if_errors_per_minute rescue 0
|
||||||
|
|
||||||
if (error_rate_per_minute || 0) > 0
|
if (error_rate_per_minute || 0) > 0
|
||||||
|
@ -129,24 +128,23 @@ Rails.application.reloader.to_prepare do
|
||||||
)
|
)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
if Rails.configuration.multisite
|
if Rails.configuration.multisite
|
||||||
if Rails.logger.respond_to? :chained
|
if Rails.logger.respond_to? :chained
|
||||||
chained = Rails.logger.chained
|
chained = Rails.logger.chained
|
||||||
chained && chained.first.formatter = RailsMultisite::Formatter.new
|
chained && chained.first.formatter = RailsMultisite::Formatter.new
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
Logster.config.project_directories = [
|
Logster.config.project_directories = [
|
||||||
{ path: Rails.root.to_s, url: "https://github.com/discourse/discourse", main_app: true }
|
{ path: Rails.root.to_s, url: "https://github.com/discourse/discourse", main_app: true }
|
||||||
]
|
]
|
||||||
Discourse.plugins.each do |plugin|
|
Discourse.plugins.each do |plugin|
|
||||||
next if !plugin.metadata.url
|
next if !plugin.metadata.url
|
||||||
|
|
||||||
Logster.config.project_directories << {
|
Logster.config.project_directories << {
|
||||||
path: "#{Rails.root.to_s}/plugins/#{plugin.directory_name}",
|
path: "#{Rails.root.to_s}/plugins/#{plugin.directory_name}",
|
||||||
url: plugin.metadata.url
|
url: plugin.metadata.url
|
||||||
}
|
}
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue