Skip to content

Commit a34c9dd

Browse files
committed
add solid_queue files
1 parent 558c4cb commit a34c9dd

File tree

7 files changed

+174
-10
lines changed

7 files changed

+174
-10
lines changed

Gemfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ gem 'addressable'
9595
gem 'progress_bar'
9696
gem 'rails_autolink'
9797
gem 'kramdown'
98-
gem 'solid_queue'
98+
gem 'solid_queue', "~> 1.0"
9999
gem 'mission_control-jobs'
100100
gem 'acts-as-taggable-on'
101101
gem 'resync' # , github: 'nabeta/resync', branch: 'add-datetime'

Gemfile.lock

+8-8
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ GEM
5050
erubi (~> 1.11)
5151
rails-dom-testing (~> 2.2)
5252
rails-html-sanitizer (~> 1.6)
53-
active_storage_validations (1.1.4)
53+
active_storage_validations (1.2.0)
5454
activejob (>= 5.2.0)
5555
activemodel (>= 5.2.0)
5656
activestorage (>= 5.2.0)
@@ -205,7 +205,7 @@ GEM
205205
activesupport (>= 6.0.0)
206206
railties (>= 6.0.0)
207207
io-console (0.7.2)
208-
irb (1.14.0)
208+
irb (1.14.1)
209209
rdoc (>= 4.0.0)
210210
reline (>= 0.4.2)
211211
jbuilder (2.13.0)
@@ -391,7 +391,7 @@ GEM
391391
typesafe_enum (~> 0.1, >= 0.1.5)
392392
xml-mapping (~> 0.10)
393393
xml-mapping_extensions (~> 0.4, >= 0.4.8)
394-
rexml (3.3.7)
394+
rexml (3.3.8)
395395
rsolr (2.6.0)
396396
builder (>= 2.1.2)
397397
faraday (>= 0.9, < 3, != 2.0.0)
@@ -429,7 +429,7 @@ GEM
429429
sprockets-rails
430430
tilt
431431
scanf (1.0.0)
432-
selenium-webdriver (4.24.0)
432+
selenium-webdriver (4.25.0)
433433
base64 (~> 0.2)
434434
logger (~> 1.4)
435435
rexml (~> 3.2, >= 3.2.5)
@@ -444,7 +444,7 @@ GEM
444444
simplecov_json_formatter (0.1.4)
445445
sitemap_generator (6.3.0)
446446
builder (~> 3.0)
447-
solid_queue (0.9.0)
447+
solid_queue (1.0.0)
448448
activejob (>= 7.1)
449449
activerecord (>= 7.1)
450450
concurrent-ruby (>= 1.3.1)
@@ -479,7 +479,7 @@ GEM
479479
thor (1.3.2)
480480
tilt (2.4.0)
481481
timeout (0.4.1)
482-
turbo-rails (2.0.9)
482+
turbo-rails (2.0.10)
483483
actionpack (>= 6.0.0)
484484
railties (>= 6.0.0)
485485
typesafe_enum (0.3.1)
@@ -505,7 +505,7 @@ GEM
505505
rack-proxy (>= 0.6.1)
506506
railties (>= 5.2)
507507
semantic_range (>= 2.3.0)
508-
webrick (1.8.1)
508+
webrick (1.8.2)
509509
websocket (1.2.11)
510510
websocket-driver (0.7.6)
511511
websocket-extensions (>= 0.1.0)
@@ -578,7 +578,7 @@ DEPENDENCIES
578578
selenium-webdriver
579579
simplecov
580580
sitemap_generator
581-
solid_queue
581+
solid_queue (~> 1.0)
582582
sprockets-rails
583583
statesman (~> 12.1)
584584
strip_attributes

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)

config/environments/production.rb

+2-1
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@
6969

7070
# Use a real queuing backend for Active Job (and separate queues per environment).
7171
config.active_job.queue_adapter = :solid_queue
72+
config.solid_queue.connects_to = { database: { writing: :queue } }
73+
7274
config.active_job.queue_name_prefix = "enju_leaf_production"
7375

7476
config.action_mailer.perform_caching = false
@@ -94,5 +96,4 @@
9496
# ]
9597
# Skip DNS rebinding protection for the default health check endpoint.
9698
# config.host_authorization = { exclude: ->(request) { request.path == "/up" } }
97-
config.active_job.queue_adapter = :solid_queue
9899
end

config/queue.yml

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

config/recurring.yml

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# production:
2+
# periodic_cleanup:
3+
# class: CleanSoftDeletedRecordsJob
4+
# queue: background
5+
# args: [ 1000, { batch_size: 500 } ]
6+
# schedule: every hour
7+
# periodic_command:
8+
# command: "SoftDeletedRecord.due.delete_all"
9+
# priority: 2
10+
# schedule: at 5am every day

db/queue_schema.rb

+129
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
ActiveRecord::Schema[7.1].define(version: 1) do
2+
create_table "solid_queue_blocked_executions", force: :cascade do |t|
3+
t.bigint "job_id", null: false
4+
t.string "queue_name", null: false
5+
t.integer "priority", default: 0, null: false
6+
t.string "concurrency_key", null: false
7+
t.datetime "expires_at", null: false
8+
t.datetime "created_at", null: false
9+
t.index [ "concurrency_key", "priority", "job_id" ], name: "index_solid_queue_blocked_executions_for_release"
10+
t.index [ "expires_at", "concurrency_key" ], name: "index_solid_queue_blocked_executions_for_maintenance"
11+
t.index [ "job_id" ], name: "index_solid_queue_blocked_executions_on_job_id", unique: true
12+
end
13+
14+
create_table "solid_queue_claimed_executions", force: :cascade do |t|
15+
t.bigint "job_id", null: false
16+
t.bigint "process_id"
17+
t.datetime "created_at", null: false
18+
t.index [ "job_id" ], name: "index_solid_queue_claimed_executions_on_job_id", unique: true
19+
t.index [ "process_id", "job_id" ], name: "index_solid_queue_claimed_executions_on_process_id_and_job_id"
20+
end
21+
22+
create_table "solid_queue_failed_executions", force: :cascade do |t|
23+
t.bigint "job_id", null: false
24+
t.text "error"
25+
t.datetime "created_at", null: false
26+
t.index [ "job_id" ], name: "index_solid_queue_failed_executions_on_job_id", unique: true
27+
end
28+
29+
create_table "solid_queue_jobs", force: :cascade do |t|
30+
t.string "queue_name", null: false
31+
t.string "class_name", null: false
32+
t.text "arguments"
33+
t.integer "priority", default: 0, null: false
34+
t.string "active_job_id"
35+
t.datetime "scheduled_at"
36+
t.datetime "finished_at"
37+
t.string "concurrency_key"
38+
t.datetime "created_at", null: false
39+
t.datetime "updated_at", null: false
40+
t.index [ "active_job_id" ], name: "index_solid_queue_jobs_on_active_job_id"
41+
t.index [ "class_name" ], name: "index_solid_queue_jobs_on_class_name"
42+
t.index [ "finished_at" ], name: "index_solid_queue_jobs_on_finished_at"
43+
t.index [ "queue_name", "finished_at" ], name: "index_solid_queue_jobs_for_filtering"
44+
t.index [ "scheduled_at", "finished_at" ], name: "index_solid_queue_jobs_for_alerting"
45+
end
46+
47+
create_table "solid_queue_pauses", force: :cascade do |t|
48+
t.string "queue_name", null: false
49+
t.datetime "created_at", null: false
50+
t.index [ "queue_name" ], name: "index_solid_queue_pauses_on_queue_name", unique: true
51+
end
52+
53+
create_table "solid_queue_processes", force: :cascade do |t|
54+
t.string "kind", null: false
55+
t.datetime "last_heartbeat_at", null: false
56+
t.bigint "supervisor_id"
57+
t.integer "pid", null: false
58+
t.string "hostname"
59+
t.text "metadata"
60+
t.datetime "created_at", null: false
61+
t.string "name", null: false
62+
t.index [ "last_heartbeat_at" ], name: "index_solid_queue_processes_on_last_heartbeat_at"
63+
t.index [ "name", "supervisor_id" ], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true
64+
t.index [ "supervisor_id" ], name: "index_solid_queue_processes_on_supervisor_id"
65+
end
66+
67+
create_table "solid_queue_ready_executions", force: :cascade do |t|
68+
t.bigint "job_id", null: false
69+
t.string "queue_name", null: false
70+
t.integer "priority", default: 0, null: false
71+
t.datetime "created_at", null: false
72+
t.index [ "job_id" ], name: "index_solid_queue_ready_executions_on_job_id", unique: true
73+
t.index [ "priority", "job_id" ], name: "index_solid_queue_poll_all"
74+
t.index [ "queue_name", "priority", "job_id" ], name: "index_solid_queue_poll_by_queue"
75+
end
76+
77+
create_table "solid_queue_recurring_executions", force: :cascade do |t|
78+
t.bigint "job_id", null: false
79+
t.string "task_key", null: false
80+
t.datetime "run_at", null: false
81+
t.datetime "created_at", null: false
82+
t.index [ "job_id" ], name: "index_solid_queue_recurring_executions_on_job_id", unique: true
83+
t.index [ "task_key", "run_at" ], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true
84+
end
85+
86+
create_table "solid_queue_recurring_tasks", force: :cascade do |t|
87+
t.string "key", null: false
88+
t.string "schedule", null: false
89+
t.string "command", limit: 2048
90+
t.string "class_name"
91+
t.text "arguments"
92+
t.string "queue_name"
93+
t.integer "priority", default: 0
94+
t.boolean "static", default: true, null: false
95+
t.text "description"
96+
t.datetime "created_at", null: false
97+
t.datetime "updated_at", null: false
98+
t.index [ "key" ], name: "index_solid_queue_recurring_tasks_on_key", unique: true
99+
t.index [ "static" ], name: "index_solid_queue_recurring_tasks_on_static"
100+
end
101+
102+
create_table "solid_queue_scheduled_executions", force: :cascade do |t|
103+
t.bigint "job_id", null: false
104+
t.string "queue_name", null: false
105+
t.integer "priority", default: 0, null: false
106+
t.datetime "scheduled_at", null: false
107+
t.datetime "created_at", null: false
108+
t.index [ "job_id" ], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true
109+
t.index [ "scheduled_at", "priority", "job_id" ], name: "index_solid_queue_dispatch_all"
110+
end
111+
112+
create_table "solid_queue_semaphores", force: :cascade do |t|
113+
t.string "key", null: false
114+
t.integer "value", default: 1, null: false
115+
t.datetime "expires_at", null: false
116+
t.datetime "created_at", null: false
117+
t.datetime "updated_at", null: false
118+
t.index [ "expires_at" ], name: "index_solid_queue_semaphores_on_expires_at"
119+
t.index [ "key", "value" ], name: "index_solid_queue_semaphores_on_key_and_value"
120+
t.index [ "key" ], name: "index_solid_queue_semaphores_on_key", unique: true
121+
end
122+
123+
add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
124+
add_foreign_key "solid_queue_claimed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
125+
add_foreign_key "solid_queue_failed_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
126+
add_foreign_key "solid_queue_ready_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
127+
add_foreign_key "solid_queue_recurring_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
128+
add_foreign_key "solid_queue_scheduled_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade
129+
end

0 commit comments

Comments
 (0)