Skip to content

Commit

Permalink
Update solid_queue to version 1.0
Browse files Browse the repository at this point in the history
Clear up all migrations and previous configurations in favour of the new
ones.
  • Loading branch information
rosa committed Nov 5, 2024
1 parent b7b0467 commit a09b859
Show file tree
Hide file tree
Showing 19 changed files with 205 additions and 339 deletions.
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,4 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
# Specify your gem's dependencies in mission_control-jobs.gemspec.
gemspec

gem "solid_queue", github: "rails/solid_queue", branch: "improve-recurring-tasks-config"

gem "capybara", github: "teamcapybara/capybara"
22 changes: 8 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,3 @@
GIT
remote: https://github.com/rails/solid_queue.git
revision: 8df600df2d22261cdce3e51e103c1cf58d4da391
branch: improve-recurring-tasks-config
specs:
solid_queue (0.8.2)
activejob (>= 7.1)
activerecord (>= 7.1)
concurrent-ruby (>= 1.3.1)
fugit (~> 1.11.0)
railties (>= 7.1)
thor (~> 1.3.1)

GIT
remote: https://github.com/teamcapybara/capybara.git
revision: c0cbf4024c1abd48b0c22c2930e7b05af58ab284
Expand Down Expand Up @@ -309,6 +296,13 @@ GEM
rack-session (>= 2.0.0, < 3)
tilt (~> 2.0)
smart_properties (1.17.0)
solid_queue (1.0.0)
activejob (>= 7.1)
activerecord (>= 7.1)
concurrent-ruby (>= 1.3.1)
fugit (~> 1.11.0)
railties (>= 7.1)
thor (~> 1.3.1)
sprockets (4.2.1)
concurrent-ruby (~> 1.0)
rack (>= 2.2.4, < 4)
Expand Down Expand Up @@ -367,7 +361,7 @@ DEPENDENCIES
rubocop-performance
rubocop-rails-omakase
selenium-webdriver
solid_queue!
solid_queue (~> 1.0)
sprockets-rails
sqlite3

Expand Down
2 changes: 1 addition & 1 deletion mission_control-jobs.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
spec.add_dependency "irb", "~> 1.13"

spec.add_development_dependency "resque"
spec.add_development_dependency "solid_queue", ">= 0.9"
spec.add_development_dependency "solid_queue", "~> 1.0"
spec.add_development_dependency "selenium-webdriver"
spec.add_development_dependency "resque-pause"
spec.add_development_dependency "mocha"
Expand Down
6 changes: 6 additions & 0 deletions test/dummy/bin/jobs
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
#!/usr/bin/env ruby

require_relative "../config/environment"
require "solid_queue/cli"

SolidQueue::Cli.start(ARGV)
21 changes: 16 additions & 5 deletions test/dummy/config/database.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,27 @@ default: &default
timeout: 5000

development:
<<: *default
database: db/development.sqlite3
primary:
<<: *default
database: db/development.sqlite3
queue:
<<: *default
database: db/development_queue.sqlite3
migrations_paths: db/queue_migrate

# Warning: The database defined as "test" will be erased and
# re-generated from your development database when you run "rake".
# Do not set this db to the same as development or production.
test:
<<: *default
pool: 10
database: db/test.sqlite3
primary:
<<: *default
pool: 10
database: db/test.sqlite3
queue:
<<: *default
pool: 10
database: db/test_queue.sqlite3
migrations_paths: db/queue_migrate

production:
<<: *default
Expand Down
1 change: 1 addition & 0 deletions test/dummy/config/environments/development.rb
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@
# config.action_cable.disable_request_forgery_protection = true

config.active_job.queue_adapter = :resque
config.solid_queue.connects_to = { database: { writing: :queue } }

# Silence Solid Queue logging
config.solid_queue.logger = ActiveSupport::Logger.new(nil)
Expand Down
4 changes: 3 additions & 1 deletion test/dummy/config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,9 @@
# config.cache_store = :mem_cache_store

# Use a real queuing backend for Active Job (and separate queues per environment).
# config.active_job.queue_adapter = :resque
# config.active_job.queue_adapter = :solid_queue
# config.solid_queue.connects_to = { database: { writing: :queue } }

# config.active_job.queue_name_prefix = "dummy_production"

config.action_mailer.perform_caching = false
Expand Down
2 changes: 2 additions & 0 deletions test/dummy/config/environments/test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,8 @@
# config.action_view.annotate_rendered_view_with_filenames = true
config.active_job.queue_adapter = :resque

config.solid_queue.connects_to = { database: { writing: :queue } }

# Silence Solid Queue logging
config.solid_queue.logger = ActiveSupport::Logger.new(nil)
end
18 changes: 18 additions & 0 deletions test/dummy/config/queue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
default: &default
dispatchers:
- polling_interval: 20
batch_size: 500
workers:
- queues: "*"
threads: 3
processes: <%= ENV.fetch("JOB_CONCURRENCY", 1) %>
polling_interval: 10

development:
<<: *default

test:
<<: *default

production:
<<: *default
10 changes: 10 additions & 0 deletions test/dummy/config/recurring.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
production:
periodic_cleanup:
class: DummyJob
queue: background
args: 1000
schedule: every hour
periodic_post:
command: "Post.create!(title: 'Hey')"
priority: 2
schedule: at 5am every day
26 changes: 0 additions & 26 deletions test/dummy/config/solid_queue.yml

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading

0 comments on commit a09b859

Please sign in to comment.