112385fd9e
Resolves 26 conflicts via manual review. Key decisions: - signature: kept fork's send-time architecture (PR #79), discarded upstream's editor-manipulation functions - WhatsApp incoming: combined fork's two-layer locking (source_id + contact phone) with upstream's blocked-contact drop. Fixed pre-existing regression where echoes were silently dropped - InstallationConfig: upstream's simplified coder (validated against legacy YAML-in-jsonb data) - schema.rb: regenerated, stripped kanban tables from other branches, restored f_unaccent SQL function
55 lines
1.9 KiB
Ruby
55 lines
1.9 KiB
Ruby
require Rails.root.join('lib/redis/config')
|
|
|
|
schedule_file = 'config/schedule.yml'
|
|
|
|
Sidekiq.configure_client do |config|
|
|
config.redis = Redis::Config.app
|
|
end
|
|
|
|
# Logs whenever a job is pulled off Redis for execution.
|
|
class ChatwootDequeuedLogger
|
|
def call(_worker, job, queue)
|
|
payload = job['args'].first
|
|
Sidekiq.logger.info("Dequeued #{job['wrapped']} #{payload['job_id']} from #{queue}")
|
|
yield
|
|
end
|
|
end
|
|
|
|
Sidekiq.configure_server do |config|
|
|
config.redis = Redis::Config.app
|
|
|
|
if ActiveModel::Type::Boolean.new.cast(ENV.fetch('ENABLE_SIDEKIQ_DEQUEUE_LOGGER', false))
|
|
config.server_middleware do |chain|
|
|
chain.add ChatwootDequeuedLogger
|
|
end
|
|
end
|
|
|
|
# skip the default start stop logging
|
|
if Rails.env.production?
|
|
config.logger.formatter = Sidekiq::Logger::Formatters::JSON.new
|
|
config[:skip_default_job_logging] = true
|
|
config.logger.level = Logger.const_get(ENV.fetch('LOG_LEVEL', 'info').upcase.to_s)
|
|
end
|
|
end
|
|
|
|
# https://github.com/ondrejbartas/sidekiq-cron
|
|
# Reduce poll interval for second-precision cron jobs
|
|
Sidekiq::Options[:cron_poll_interval] = 10
|
|
|
|
Rails.application.reloader.to_prepare do
|
|
# load_from_hash! upserts jobs from the YAML and removes any Redis-persisted
|
|
# jobs that share the same source tag but are no longer in the file.
|
|
# This ensures deleted schedule entries are cleaned up on deploy.
|
|
if File.exist?(schedule_file) && Sidekiq.server?
|
|
schedule = YAML.load_file(schedule_file)
|
|
|
|
# Cron entries removed from schedule.yml but possibly still in Redis
|
|
# with source:'dynamic' (predating the source tag). load_from_hash!
|
|
# only cleans up source:'schedule' entries, so these need explicit removal.
|
|
# Remove names from this list once they've been through a deploy cycle.
|
|
%w[bulk_auto_assignment_job].each { |name| Sidekiq::Cron::Job.destroy(name) }
|
|
|
|
Sidekiq::Cron::Job.load_from_hash!(schedule, source: 'schedule')
|
|
end
|
|
end
|