diff --git a/config/application.rb b/config/application.rb index 111c989f899..00a93c6a262 100644 --- a/config/application.rb +++ b/config/application.rb @@ -55,8 +55,6 @@ require 'pry-rails' if Rails.env.development? require 'discourse_fonts' -require_relative '../lib/zeitwerk_config.rb' - if defined?(Bundler) bundler_groups = [:default] @@ -118,7 +116,6 @@ module Discourse config.autoload_paths += Dir["#{config.root}/lib/validators/"] Rails.autoloaders.main.ignore(Dir["#{config.root}/app/models/reports"]) - Rails.autoloaders.main.ignore(Dir["#{config.root}/lib/freedom_patches"]) # Only load the plugins named here, in the order given (default is alphabetical). # :all can be used as a placeholder for all plugins not explicitly named. diff --git a/config/initializers/002-freedom_patches.rb b/config/initializers/002-freedom_patches.rb index 520e82ac295..255652ba206 100644 --- a/config/initializers/002-freedom_patches.rb +++ b/config/initializers/002-freedom_patches.rb @@ -1,7 +1,5 @@ # frozen_string_literal: true -Rails.application.reloader.to_prepare do - Dir["#{Rails.root}/lib/freedom_patches/*.rb"].each do |f| - require(f) - end +Dir["#{Rails.root}/lib/freedom_patches/*.rb"].each do |f| + require(f) end diff --git a/config/initializers/005-site_settings.rb b/config/initializers/005-site_settings.rb index f437b739883..4ecaa85df33 100644 --- a/config/initializers/005-site_settings.rb +++ b/config/initializers/005-site_settings.rb @@ -16,26 +16,24 @@ if GlobalSetting.skip_redis? return end -Rails.application.reloader.to_prepare do - reload_settings = lambda { - RailsMultisite::ConnectionManagement.safe_each_connection do - begin - SiteSetting.refresh! +reload_settings = lambda { + RailsMultisite::ConnectionManagement.safe_each_connection do + begin + SiteSetting.refresh! - unless String === SiteSetting.push_api_secret_key && SiteSetting.push_api_secret_key.length == 32 - SiteSetting.push_api_secret_key = SecureRandom.hex - end - rescue ActiveRecord::StatementInvalid - # This will happen when migrating a new database + unless String === SiteSetting.push_api_secret_key && SiteSetting.push_api_secret_key.length == 32 + SiteSetting.push_api_secret_key = SecureRandom.hex end - end - } - - reload_settings.call - - if !Rails.configuration.cache_classes - ActiveSupport::Reloader.to_prepare do - reload_settings.call + rescue ActiveRecord::StatementInvalid + # This will happen when migrating a new database end end +} + +reload_settings.call + +if !Rails.configuration.cache_classes + ActiveSupport::Reloader.to_prepare do + reload_settings.call + end end diff --git a/config/initializers/100-i18n.rb b/config/initializers/100-i18n.rb index 1a49029738f..739fca222dd 100644 --- a/config/initializers/100-i18n.rb +++ b/config/initializers/100-i18n.rb @@ -5,17 +5,15 @@ require 'i18n/backend/discourse_i18n' require 'i18n/backend/fallback_locale_list' -Rails.application.reloader.to_prepare do - I18n.backend = I18n::Backend::DiscourseI18n.new - I18n.fallbacks = I18n::Backend::FallbackLocaleList.new - I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) } - I18n.reload! - I18n.init_accelerator!(overrides_enabled: ENV['DISABLE_TRANSLATION_OVERRIDES'] != '1') +I18n.backend = I18n::Backend::DiscourseI18n.new +I18n.fallbacks = I18n::Backend::FallbackLocaleList.new +I18n.config.missing_interpolation_argument_handler = proc { throw(:exception) } +I18n.reload! +I18n.init_accelerator!(overrides_enabled: ENV['DISABLE_TRANSLATION_OVERRIDES'] != '1') - unless Rails.env.test? - MessageBus.subscribe("/i18n-flush") do - I18n.reload! - ExtraLocalesController.clear_cache! - end +unless Rails.env.test? + MessageBus.subscribe("/i18n-flush") do + I18n.reload! + ExtraLocalesController.clear_cache! end end diff --git a/config/initializers/100-logster.rb b/config/initializers/100-logster.rb index 5b89d984f58..099747ae82a 100644 --- a/config/initializers/100-logster.rb +++ b/config/initializers/100-logster.rb @@ -1,152 +1,148 @@ # frozen_string_literal: true if GlobalSetting.skip_redis? - Rails.application.reloader.to_prepare do - if Rails.logger.respond_to? :chained - Rails.logger = Rails.logger.chained.first - end + if Rails.logger.respond_to? :chained + Rails.logger = Rails.logger.chained.first end return end -Rails.application.reloader.to_prepare do - 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 "We recommend you upgrade to Ruby 2.6.1 for the optimal development performance" +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 "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 - # the Queue class which causes segmentation faults - Logster::Scheduler.disable - end + # 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 + Logster::Scheduler.disable +end - if Rails.env.development? && !Sidekiq.server? && ENV["RAILS_LOGS_STDOUT"] == "1" - console = ActiveSupport::Logger.new(STDOUT) - original_logger = Rails.logger.chained.first - console.formatter = original_logger.formatter - console.level = original_logger.level +if Rails.env.development? && !Sidekiq.server? && ENV["RAILS_LOGS_STDOUT"] == "1" + console = ActiveSupport::Logger.new(STDOUT) + original_logger = Rails.logger.chained.first + console.formatter = original_logger.formatter + console.level = original_logger.level - unless ActiveSupport::Logger.logger_outputs_to?(original_logger, STDOUT) - original_logger.extend(ActiveSupport::Logger.broadcast(console)) - end - end - - if Rails.env.production? - Logster.store.ignore = [ - # honestly, Rails should not be logging this, its real noisy - /^ActionController::RoutingError \(No route matches/, - - /^PG::Error: ERROR:\s+duplicate key/, - - /^ActionController::UnknownFormat/, - /^ActionController::UnknownHttpMethod/, - /^AbstractController::ActionNotFound/, - # ignore any empty JS errors that contain blanks or zeros for line and column fields - # - # Line: - # Column: - # - /(?m).*?Line: (?:\D|0).*?Column: (?:\D|0)/, - - # suppress empty JS errors (covers MSIE 9, etc) - /^(Syntax|Script) error.*Line: (0|1)\b/m, - - # CSRF errors are not providing enough data - # suppress unconditionally for now - /^Can't verify CSRF token authenticity.$/, - - # Yandex bot triggers this JS error a lot - /^Uncaught ReferenceError: I18n is not defined/, - - # related to browser plugins somehow, we don't care - /Error calling method on NPObject/, - - # 404s can be dealt with elsewhere - /^ActiveRecord::RecordNotFound/, - - # bad asset requested, no need to log - /^ActionController::BadRequest/, - - # we can't do anything about invalid parameters - /Rack::QueryParser::InvalidParameterError/, - - # we handle this cleanly in the message bus middleware - # no point logging to logster - /RateLimiter::LimitExceeded.*/m, - - # see https://github.com/rails/rails/issues/34599 - # Poll defines an enum with the value `open` ActiveRecord then attempts - # AR then warns cause #open is being redefined, it is already defined - # privately in Kernel per: http://ruby-doc.org/core-2.5.3/Kernel.html#method-i-open - # Once the rails issue is fixed we can stop this error suppression and stop defining - # scopes for the enums - /^Creating scope :open\. Overwriting existing method Poll\.open\./, - ] - Logster.config.env_expandable_keys.push(:hostname, :problem_db) - end - - Logster.store.max_backlog = GlobalSetting.max_logster_logs - - # TODO logster should be able to do this automatically - Logster.config.subdirectory = "#{GlobalSetting.relative_url_root}/logs" - - Logster.config.application_version = Discourse.git_version - Logster.config.enable_custom_patterns_via_ui = true - Logster.config.enable_js_error_reporting = GlobalSetting.enable_js_error_reporting - - store = Logster.store - redis = Logster.store.redis - store.redis_prefix = Proc.new { redis.namespace } - store.redis_raw_connection = redis.without_namespace - severities = [Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN] - - RailsMultisite::ConnectionManagement.each_connection do - error_rate_per_minute = SiteSetting.alert_admins_if_errors_per_minute rescue 0 - - if (error_rate_per_minute || 0) > 0 - store.register_rate_limit_per_minute(severities, error_rate_per_minute) do |rate| - MessageBus.publish("/logs_error_rate_exceeded", - { - rate: rate, - duration: 'minute', - publish_at: Time.current.to_i - }, - group_ids: [Group::AUTO_GROUPS[:admins]] - ) - end - end - - error_rate_per_hour = SiteSetting.alert_admins_if_errors_per_hour rescue 0 - - if (error_rate_per_hour || 0) > 0 - store.register_rate_limit_per_hour(severities, error_rate_per_hour) do |rate| - MessageBus.publish("/logs_error_rate_exceeded", - { - rate: rate, - duration: 'hour', - publish_at: Time.current.to_i, - }, - group_ids: [Group::AUTO_GROUPS[:admins]] - ) - end - end - end - - if Rails.configuration.multisite - if Rails.logger.respond_to? :chained - chained = Rails.logger.chained - chained && chained.first.formatter = RailsMultisite::Formatter.new - end - end - - Logster.config.project_directories = [ - { path: Rails.root.to_s, url: "https://github.com/discourse/discourse", main_app: true } - ] - Discourse.plugins.each do |plugin| - next if !plugin.metadata.url - - Logster.config.project_directories << { - path: "#{Rails.root.to_s}/plugins/#{plugin.directory_name}", - url: plugin.metadata.url - } + unless ActiveSupport::Logger.logger_outputs_to?(original_logger, STDOUT) + original_logger.extend(ActiveSupport::Logger.broadcast(console)) end end + +if Rails.env.production? + Logster.store.ignore = [ + # honestly, Rails should not be logging this, its real noisy + /^ActionController::RoutingError \(No route matches/, + + /^PG::Error: ERROR:\s+duplicate key/, + + /^ActionController::UnknownFormat/, + /^ActionController::UnknownHttpMethod/, + /^AbstractController::ActionNotFound/, + # ignore any empty JS errors that contain blanks or zeros for line and column fields + # + # Line: + # Column: + # + /(?m).*?Line: (?:\D|0).*?Column: (?:\D|0)/, + + # suppress empty JS errors (covers MSIE 9, etc) + /^(Syntax|Script) error.*Line: (0|1)\b/m, + + # CSRF errors are not providing enough data + # suppress unconditionally for now + /^Can't verify CSRF token authenticity.$/, + + # Yandex bot triggers this JS error a lot + /^Uncaught ReferenceError: I18n is not defined/, + + # related to browser plugins somehow, we don't care + /Error calling method on NPObject/, + + # 404s can be dealt with elsewhere + /^ActiveRecord::RecordNotFound/, + + # bad asset requested, no need to log + /^ActionController::BadRequest/, + + # we can't do anything about invalid parameters + /Rack::QueryParser::InvalidParameterError/, + + # we handle this cleanly in the message bus middleware + # no point logging to logster + /RateLimiter::LimitExceeded.*/m, + + # see https://github.com/rails/rails/issues/34599 + # Poll defines an enum with the value `open` ActiveRecord then attempts + # AR then warns cause #open is being redefined, it is already defined + # privately in Kernel per: http://ruby-doc.org/core-2.5.3/Kernel.html#method-i-open + # Once the rails issue is fixed we can stop this error suppression and stop defining + # scopes for the enums + /^Creating scope :open\. Overwriting existing method Poll\.open\./, + ] + Logster.config.env_expandable_keys.push(:hostname, :problem_db) +end + +Logster.store.max_backlog = GlobalSetting.max_logster_logs + +# TODO logster should be able to do this automatically +Logster.config.subdirectory = "#{GlobalSetting.relative_url_root}/logs" + +Logster.config.application_version = Discourse.git_version +Logster.config.enable_custom_patterns_via_ui = true +Logster.config.enable_js_error_reporting = GlobalSetting.enable_js_error_reporting + +store = Logster.store +redis = Logster.store.redis +store.redis_prefix = Proc.new { redis.namespace } +store.redis_raw_connection = redis.without_namespace +severities = [Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN] + +RailsMultisite::ConnectionManagement.each_connection do + error_rate_per_minute = SiteSetting.alert_admins_if_errors_per_minute rescue 0 + + if (error_rate_per_minute || 0) > 0 + store.register_rate_limit_per_minute(severities, error_rate_per_minute) do |rate| + MessageBus.publish("/logs_error_rate_exceeded", + { + rate: rate, + duration: 'minute', + publish_at: Time.current.to_i + }, + group_ids: [Group::AUTO_GROUPS[:admins]] + ) + end + end + + error_rate_per_hour = SiteSetting.alert_admins_if_errors_per_hour rescue 0 + + if (error_rate_per_hour || 0) > 0 + store.register_rate_limit_per_hour(severities, error_rate_per_hour) do |rate| + MessageBus.publish("/logs_error_rate_exceeded", + { + rate: rate, + duration: 'hour', + publish_at: Time.current.to_i, + }, + group_ids: [Group::AUTO_GROUPS[:admins]] + ) + end + end +end + +if Rails.configuration.multisite + if Rails.logger.respond_to? :chained + chained = Rails.logger.chained + chained && chained.first.formatter = RailsMultisite::Formatter.new + end +end + +Logster.config.project_directories = [ + { path: Rails.root.to_s, url: "https://github.com/discourse/discourse", main_app: true } +] +Discourse.plugins.each do |plugin| + next if !plugin.metadata.url + + Logster.config.project_directories << { + path: "#{Rails.root.to_s}/plugins/#{plugin.directory_name}", + url: plugin.metadata.url + } +end diff --git a/lib/zeitwerk_config.rb b/lib/freedom_patches/zeitwerk.rb similarity index 100% rename from lib/zeitwerk_config.rb rename to lib/freedom_patches/zeitwerk.rb