From 08c584b85b7d656ece9221538861a8a5ac28bbaf Mon Sep 17 00:00:00 2001 From: songtianlun Date: Wed, 22 Jan 2025 18:47:41 +0800 Subject: [PATCH] chore: rename job classes and update Sidekiq config - Renamed `BatchGenerateWeatherArtsJob` to `BatchGenerateWeatherArtsWorker` - Renamed `GenerateWeatherArtJob` to `GenerateWeatherArtWorker` - Updated Sidekiq configuration to set Redis URL and logger level - Modified `sidekiq.yml` to use the new worker class names and added queue configurations These changes help in aligning the class names with their purpose as workers in Sidekiq, while also ensuring better configuration for Redis and logging. --- ..._arts_job.rb => batch_generate_weather_arts_worker.rb} | 0 ..._weather_art_job.rb => generate_weather_art_worker.rb} | 0 config/initializers/sidekiq.rb | 6 ++++++ config/sidekiq.yml | 8 +++++++- 4 files changed, 13 insertions(+), 1 deletion(-) rename app/workers/{batch_generate_weather_arts_job.rb => batch_generate_weather_arts_worker.rb} (100%) rename app/workers/{generate_weather_art_job.rb => generate_weather_art_worker.rb} (100%) diff --git a/app/workers/batch_generate_weather_arts_job.rb b/app/workers/batch_generate_weather_arts_worker.rb similarity index 100% rename from app/workers/batch_generate_weather_arts_job.rb rename to app/workers/batch_generate_weather_arts_worker.rb diff --git a/app/workers/generate_weather_art_job.rb b/app/workers/generate_weather_art_worker.rb similarity index 100% rename from app/workers/generate_weather_art_job.rb rename to app/workers/generate_weather_art_worker.rb diff --git a/config/initializers/sidekiq.rb b/config/initializers/sidekiq.rb index c0baea1..30e4cbc 100644 --- a/config/initializers/sidekiq.rb +++ b/config/initializers/sidekiq.rb @@ -2,8 +2,14 @@ require "sidekiq" require "sidekiq-scheduler" Sidekiq.configure_server do |config| + config.redis = { url: ENV.fetch("REDIS_URL", "redis://localhost:6379/1") } + config.logger.level = Logger::INFO config.on(:startup) do Sidekiq.schedule = YAML.load_file(File.expand_path("../../sidekiq.yml", __FILE__)) Sidekiq::Scheduler.reload_schedule! end end + +Sidekiq.configure_client do |config| + config.redis = { url: ENV.fetch("REDIS_URL", "redis://localhost:6379/1") } +end diff --git a/config/sidekiq.yml b/config/sidekiq.yml index 106e43f..28cd144 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -1,4 +1,10 @@ :schedule: sample_job: cron: '0 * * * *' # 每小时执行 - class: BatchGenerateWeatherArtsJob.perform_later \ No newline at end of file + class: BatchGenerateWeatherArtsWorker + +:concurrency: 5 +:queues: + - default + - mailers + - low \ No newline at end of file