mirror of
https://github.com/discourse/discourse.git
synced 2025-02-20 03:34:59 +08:00
FIX: Don’t put the whole sidekiq conf in to_prepare
Some of the Sidekiq configuration needs to happen when the initializers run and not after otherwise our dev env isn’t usable anymore.
This commit is contained in:
parent
5743a6ec1e
commit
58d6e4e233
|
@ -1,43 +1,20 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
Rails.application.reloader.to_prepare do
|
||||
require "sidekiq/pausable"
|
||||
require "sidekiq/pausable"
|
||||
|
||||
Sidekiq.configure_client do |config|
|
||||
Sidekiq.configure_client do |config|
|
||||
config.redis = Discourse.sidekiq_redis_config
|
||||
end
|
||||
end
|
||||
|
||||
Sidekiq.configure_server do |config|
|
||||
Sidekiq.configure_server do |config|
|
||||
config.redis = Discourse.sidekiq_redis_config
|
||||
|
||||
config.server_middleware do |chain|
|
||||
chain.add Sidekiq::Pausable
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
MiniScheduler.configure do |config|
|
||||
|
||||
config.redis = Discourse.redis
|
||||
|
||||
config.job_exception_handler do |ex, context|
|
||||
Discourse.handle_job_exception(ex, context)
|
||||
end
|
||||
|
||||
config.job_ran do |stat|
|
||||
DiscourseEvent.trigger(:scheduled_job_ran, stat)
|
||||
end
|
||||
|
||||
config.skip_schedule { Sidekiq.paused? }
|
||||
|
||||
config.before_sidekiq_web_request do
|
||||
RailsMultisite::ConnectionManagement.establish_connection(
|
||||
db: RailsMultisite::ConnectionManagement::DEFAULT
|
||||
)
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
if Sidekiq.server?
|
||||
if Sidekiq.server?
|
||||
|
||||
module Sidekiq
|
||||
class CLI
|
||||
|
@ -71,20 +48,20 @@ Rails.application.reloader.to_prepare do
|
|||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
# Sidekiq#logger= applies patches to whichever logger we pass it.
|
||||
# Therefore something like Sidekiq.logger = Rails.logger will break
|
||||
# all logging in the application.
|
||||
#
|
||||
# Instead, this patch adds a dedicated logger instance and patches
|
||||
# the #add method to forward messages to Rails.logger.
|
||||
Sidekiq.logger = Logger.new(nil)
|
||||
Sidekiq.logger.define_singleton_method(:add) do |severity, message = nil, progname = nil, &blk|
|
||||
# Sidekiq#logger= applies patches to whichever logger we pass it.
|
||||
# Therefore something like Sidekiq.logger = Rails.logger will break
|
||||
# all logging in the application.
|
||||
#
|
||||
# Instead, this patch adds a dedicated logger instance and patches
|
||||
# the #add method to forward messages to Rails.logger.
|
||||
Sidekiq.logger = Logger.new(nil)
|
||||
Sidekiq.logger.define_singleton_method(:add) do |severity, message = nil, progname = nil, &blk|
|
||||
Rails.logger.add(severity, message, progname, &blk)
|
||||
end
|
||||
end
|
||||
|
||||
class SidekiqLogsterReporter < Sidekiq::ExceptionHandler::Logger
|
||||
class SidekiqLogsterReporter < Sidekiq::ExceptionHandler::Logger
|
||||
def call(ex, context = {})
|
||||
|
||||
return if Jobs::HandledExceptionWrapper === ex
|
||||
|
@ -110,10 +87,38 @@ Rails.application.reloader.to_prepare do
|
|||
ensure
|
||||
Thread.current[Logster::Logger::LOGSTER_ENV] = nil
|
||||
end
|
||||
end
|
||||
|
||||
Sidekiq.error_handlers.clear
|
||||
Sidekiq.error_handlers << SidekiqLogsterReporter.new
|
||||
|
||||
Sidekiq.strict_args!
|
||||
|
||||
Rails.application.config.to_prepare do
|
||||
# Ensure that scheduled jobs are loaded before mini_scheduler is configured.
|
||||
if Rails.env.development?
|
||||
Dir.glob("#{Rails.root}/app/jobs/scheduled/*.rb") do |f|
|
||||
require(f)
|
||||
end
|
||||
end
|
||||
|
||||
Sidekiq.error_handlers.clear
|
||||
Sidekiq.error_handlers << SidekiqLogsterReporter.new
|
||||
MiniScheduler.configure do |config|
|
||||
config.redis = Discourse.redis
|
||||
|
||||
Sidekiq.strict_args!
|
||||
config.job_exception_handler do |ex, context|
|
||||
Discourse.handle_job_exception(ex, context)
|
||||
end
|
||||
|
||||
config.job_ran do |stat|
|
||||
DiscourseEvent.trigger(:scheduled_job_ran, stat)
|
||||
end
|
||||
|
||||
config.skip_schedule { Sidekiq.paused? }
|
||||
|
||||
config.before_sidekiq_web_request do
|
||||
RailsMultisite::ConnectionManagement.establish_connection(
|
||||
db: RailsMultisite::ConnectionManagement::DEFAULT
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue
Block a user