Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,3 +43,4 @@

CLAUDE.md
/.playwright-mcp/
/docs/
2 changes: 1 addition & 1 deletion .version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.9.80
2.9.81
2 changes: 1 addition & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ gem 'dartsass-rails'
gem 'devise'
gem 'devise-i18n'
gem 'enumerations'
gem 'good_job'
gem 'hamlit'
gem 'libreconv'
gem 'loaf'
Expand All @@ -76,6 +75,7 @@ gem 'rsolr', '>= 1.0', '< 3'
gem 'ruby-filemagic'
gem 'ruby-vips'
gem 'sass-embedded', '1.77.5' # temp fix for https://github.com/twbs/bootstrap/issues/40621
gem 'solid_queue'

group :development, :test do
# See https://guides.rubyonrails.org/debugging_rails_applications.html#debugging-with-the-debug-gem
Expand Down
16 changes: 8 additions & 8 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -183,13 +183,6 @@ GEM
raabro (~> 1.4)
globalid (1.3.0)
activesupport (>= 6.1)
good_job (4.13.3)
activejob (>= 6.1.0)
activerecord (>= 6.1.0)
concurrent-ruby (>= 1.3.1)
fugit (>= 1.11.0)
railties (>= 6.1.0)
thor (>= 1.0.0)
google-protobuf (4.34.0-x86_64-linux-gnu)
bigdecimal
rake (~> 13.3)
Expand Down Expand Up @@ -431,6 +424,13 @@ GEM
simplecov_json_formatter (~> 0.1)
simplecov-html (0.13.2)
simplecov_json_formatter (0.1.3)
solid_queue (1.3.2)
activejob (>= 7.1)
activerecord (>= 7.1)
concurrent-ruby (>= 1.3.1)
fugit (~> 1.11)
railties (>= 7.1)
thor (>= 1.3.1)
sqlite3 (2.9.2-x86_64-linux-gnu)
stimulus-rails (1.3.4)
railties (>= 6.0.0)
Expand Down Expand Up @@ -492,7 +492,6 @@ DEPENDENCIES
factory_bot_rails
faker
fix-db-schema-conflicts
good_job
hamlit
importmap-rails
jbuilder
Expand All @@ -518,6 +517,7 @@ DEPENDENCIES
selenium-webdriver
simplecov
simplecov_json_formatter (= 0.1.3)
solid_queue
sqlite3
stimulus-rails
turbo-rails
Expand Down
99 changes: 0 additions & 99 deletions app/controllers/loads_controller.rb

This file was deleted.

19 changes: 0 additions & 19 deletions app/jobs/update_metadata_job.rb

This file was deleted.

20 changes: 0 additions & 20 deletions app/models/ingest.rb

This file was deleted.

26 changes: 0 additions & 26 deletions app/models/load_report.rb

This file was deleted.

30 changes: 0 additions & 30 deletions app/views/loads/index.html.haml

This file was deleted.

17 changes: 0 additions & 17 deletions app/views/loads/show.html.haml

This file was deleted.

6 changes: 6 additions & 0 deletions 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)
4 changes: 1 addition & 3 deletions config/application.rb
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,7 @@ class Application < Rails::Application
# config.time_zone = "Central Time (US & Canada)"
# config.eager_load_paths << Rails.root.join("extras")
config.iiif_host = ''

# Using GoodJob as
config.active_job.queue_adapter = :good_job
config.active_job.queue_adapter = :solid_queue

# config.active_support.to_time_preserves_timezone = :zone
end
Expand Down
3 changes: 2 additions & 1 deletion config/environments/production.rb
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,8 @@
# 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 = "cerberus_production"

config.action_mailer.perform_caching = false
Expand Down
18 changes: 18 additions & 0 deletions config/queue.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
default: &default
dispatchers:
- polling_interval: 1
batch_size: 500
workers:
- queues: "*"
threads: 3
processes: <%= ENV.fetch("JOB_CONCURRENCY", 1) %>
polling_interval: 0.1

development:
<<: *default

test:
<<: *default

production:
<<: *default
15 changes: 15 additions & 0 deletions config/recurring.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# examples:
# periodic_cleanup:
# class: CleanSoftDeletedRecordsJob
# queue: background
# args: [ 1000, { batch_size: 500 } ]
# schedule: every hour
# periodic_cleanup_with_command:
# command: "SoftDeletedRecord.due.delete_all"
# priority: 2
# schedule: at 5am every day

production:
clear_solid_queue_finished_jobs:
command: "SolidQueue::Job.clear_finished_in_batches(sleep_between_batches: 0.3)"
schedule: every hour at minute 12
2 changes: 0 additions & 2 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
Rails.application.routes.draw do
devise_for :users
mount Blacklight::Engine => '/catalog'
mount GoodJob::Engine => 'good_job'
root to: 'pages#home'
concern :searchable, Blacklight::Routes::Searchable.new

Expand All @@ -27,7 +26,6 @@

resources :communities
resources :collections
resources :loads
resources :works

# xml
Expand Down
8 changes: 8 additions & 0 deletions db/migrate/20260318000001_drop_ingest_tables.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# frozen_string_literal: true

class DropIngestTables < ActiveRecord::Migration[8.0]
def up
drop_table :ingests
drop_table :load_reports
end
end
11 changes: 11 additions & 0 deletions db/migrate/20260318000002_drop_good_job_tables.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# frozen_string_literal: true

class DropGoodJobTables < ActiveRecord::Migration[8.0]
def up
drop_table :good_job_settings
drop_table :good_job_processes
drop_table :good_job_executions
drop_table :good_job_batches
drop_table :good_jobs
end
end
Loading
Loading