Skip to content

Commit a09b859

Browse files
committed
Update solid_queue to version 1.0
Clear up all migrations and previous configurations in favour of the new ones.
1 parent b7b0467 commit a09b859

19 files changed

+205
-339
lines changed

Gemfile

-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,4 @@ git_source(:github) { |repo| "https://github.com/#{repo}.git" }
44
# Specify your gem's dependencies in mission_control-jobs.gemspec.
55
gemspec
66

7-
gem "solid_queue", github: "rails/solid_queue", branch: "improve-recurring-tasks-config"
8-
97
gem "capybara", github: "teamcapybara/capybara"

Gemfile.lock

+8-14
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
GIT
2-
remote: https://github.com/rails/solid_queue.git
3-
revision: 8df600df2d22261cdce3e51e103c1cf58d4da391
4-
branch: improve-recurring-tasks-config
5-
specs:
6-
solid_queue (0.8.2)
7-
activejob (>= 7.1)
8-
activerecord (>= 7.1)
9-
concurrent-ruby (>= 1.3.1)
10-
fugit (~> 1.11.0)
11-
railties (>= 7.1)
12-
thor (~> 1.3.1)
13-
141
GIT
152
remote: https://github.com/teamcapybara/capybara.git
163
revision: c0cbf4024c1abd48b0c22c2930e7b05af58ab284
@@ -309,6 +296,13 @@ GEM
309296
rack-session (>= 2.0.0, < 3)
310297
tilt (~> 2.0)
311298
smart_properties (1.17.0)
299+
solid_queue (1.0.0)
300+
activejob (>= 7.1)
301+
activerecord (>= 7.1)
302+
concurrent-ruby (>= 1.3.1)
303+
fugit (~> 1.11.0)
304+
railties (>= 7.1)
305+
thor (~> 1.3.1)
312306
sprockets (4.2.1)
313307
concurrent-ruby (~> 1.0)
314308
rack (>= 2.2.4, < 4)
@@ -367,7 +361,7 @@ DEPENDENCIES
367361
rubocop-performance
368362
rubocop-rails-omakase
369363
selenium-webdriver
370-
solid_queue!
364+
solid_queue (~> 1.0)
371365
sprockets-rails
372366
sqlite3
373367

mission_control-jobs.gemspec

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
2323
spec.add_dependency "irb", "~> 1.13"
2424

2525
spec.add_development_dependency "resque"
26-
spec.add_development_dependency "solid_queue", ">= 0.9"
26+
spec.add_development_dependency "solid_queue", "~> 1.0"
2727
spec.add_development_dependency "selenium-webdriver"
2828
spec.add_development_dependency "resque-pause"
2929
spec.add_development_dependency "mocha"

test/dummy/bin/jobs

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
#!/usr/bin/env ruby
2+
3+
require_relative "../config/environment"
4+
require "solid_queue/cli"
5+
6+
SolidQueue::Cli.start(ARGV)

test/dummy/config/database.yml

+16-5
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,27 @@ default: &default
1010
timeout: 5000
1111

1212
development:
13-
<<: *default
14-
database: db/development.sqlite3
13+
primary:
14+
<<: *default
15+
database: db/development.sqlite3
16+
queue:
17+
<<: *default
18+
database: db/development_queue.sqlite3
19+
migrations_paths: db/queue_migrate
1520

1621
# Warning: The database defined as "test" will be erased and
1722
# re-generated from your development database when you run "rake".
1823
# Do not set this db to the same as development or production.
1924
test:
20-
<<: *default
21-
pool: 10
22-
database: db/test.sqlite3
25+
primary:
26+
<<: *default
27+
pool: 10
28+
database: db/test.sqlite3
29+
queue:
30+
<<: *default
31+
pool: 10
32+
database: db/test_queue.sqlite3
33+
migrations_paths: db/queue_migrate
2334

2435
production:
2536
<<: *default

test/dummy/config/environments/development.rb

+1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
# config.action_cable.disable_request_forgery_protection = true
7070

7171
config.active_job.queue_adapter = :resque
72+
config.solid_queue.connects_to = { database: { writing: :queue } }
7273

7374
# Silence Solid Queue logging
7475
config.solid_queue.logger = ActiveSupport::Logger.new(nil)

test/dummy/config/environments/production.rb

+3-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@
5959
# config.cache_store = :mem_cache_store
6060

6161
# Use a real queuing backend for Active Job (and separate queues per environment).
62-
# config.active_job.queue_adapter = :resque
62+
# config.active_job.queue_adapter = :solid_queue
63+
# config.solid_queue.connects_to = { database: { writing: :queue } }
64+
6365
# config.active_job.queue_name_prefix = "dummy_production"
6466

6567
config.action_mailer.perform_caching = false

test/dummy/config/environments/test.rb

+2
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@
5959
# config.action_view.annotate_rendered_view_with_filenames = true
6060
config.active_job.queue_adapter = :resque
6161

62+
config.solid_queue.connects_to = { database: { writing: :queue } }
63+
6264
# Silence Solid Queue logging
6365
config.solid_queue.logger = ActiveSupport::Logger.new(nil)
6466
end

test/dummy/config/queue.yml

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
default: &default
2+
dispatchers:
3+
- polling_interval: 20
4+
batch_size: 500
5+
workers:
6+
- queues: "*"
7+
threads: 3
8+
processes: <%= ENV.fetch("JOB_CONCURRENCY", 1) %>
9+
polling_interval: 10
10+
11+
development:
12+
<<: *default
13+
14+
test:
15+
<<: *default
16+
17+
production:
18+
<<: *default

test/dummy/config/recurring.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
production:
2+
periodic_cleanup:
3+
class: DummyJob
4+
queue: background
5+
args: 1000
6+
schedule: every hour
7+
periodic_post:
8+
command: "Post.create!(title: 'Hey')"
9+
priority: 2
10+
schedule: at 5am every day

test/dummy/config/solid_queue.yml

-26
This file was deleted.

test/dummy/db/migrate/20230914113326_create_solid_queue_tables.solid_queue.rb

-111
This file was deleted.

test/dummy/db/migrate/20240806160416_create_recurring_tasks.solid_queue.rb

-21
This file was deleted.

test/dummy/db/migrate/20240909204134_add_name_to_processes.solid_queue.rb

-6
This file was deleted.

test/dummy/db/migrate/20240909204135_make_name_not_null.solid_queue.rb

-17
This file was deleted.

test/dummy/db/migrate/20240909204136_change_solid_queue_recurring_tasks_static_to_not_null.solid_queue.rb

-6
This file was deleted.

0 commit comments

Comments
 (0)