-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
25 changed files
with
641 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# frozen_string_literal: true | ||
|
||
class ApplicationJob < ActiveJob::Base | ||
include ActiveRecordLogging | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
# frozen_string_literal: true | ||
|
||
# This module is used to log ActiveRecord queries performed in jobs. | ||
module ActiveRecordLogging | ||
extend ActiveSupport::Concern | ||
|
||
included do | ||
around_perform do |_job, block| | ||
# With our current Solid Queue setup, there is a difference between both logger: | ||
# - *ActiveRecord::Base.logger*: This logger is used for SQL queries and, normally, writes to the log file only. | ||
# - *Rails.logger*: The regular logger, which writes to the log file and the console. | ||
# For the duration of the job, we want to write the SQL queries to the Rails logger, so they show up in the console. | ||
# See config/solid_queue_logging.rb for more information. | ||
previous_logger = ActiveRecord::Base.logger | ||
ActiveRecord::Base.logger = Rails.logger | ||
block.call | ||
ActiveRecord::Base.logger = previous_logger | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,11 @@ | ||
# frozen_string_literal: true | ||
|
||
class NbpDeleteJob < ApplicationJob | ||
retry_on Faraday::Error, wait: :polynomially_longer | ||
|
||
def perform(task_uuid) | ||
Nbp::PushConnector.instance.delete_task!(task_uuid) | ||
|
||
Rails.logger.debug { "Task with UUID #{task_uuid} deleted from NBP" } | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,9 @@ | ||
# frozen_string_literal: true | ||
|
||
class NbpPushAllJob < ApplicationJob | ||
def perform | ||
Task.find_each(batch_size: 50) do |task| | ||
NbpPushJob.perform_later task | ||
end | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# frozen_string_literal: true | ||
|
||
class NbpPushJob < ApplicationJob | ||
retry_on Faraday::Error, wait: :polynomially_longer, attempts: 5 | ||
|
||
def perform(task) | ||
builder = Nokogiri::XML::Builder.new(encoding: 'UTF-8') {|xml| LomService::ExportLom.call(task:, xml:) } | ||
|
||
Nbp::PushConnector.instance.push_lom!(builder.to_xml) | ||
|
||
Rails.logger.debug { "Task ##{task.id} \"#{task}\" pushed to NBP" } | ||
end | ||
end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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: 1 | ||
# polling_interval: 0.1 | ||
# | ||
# development: | ||
# <<: *default | ||
# | ||
# test: | ||
# <<: *default | ||
# | ||
# production: | ||
# <<: *default |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,39 @@ | ||
# frozen_string_literal: true | ||
|
||
# This file must be loaded before other initializers due to the logging configuration. | ||
Rails.application.configure do | ||
# On shutdown, jobs Solid Queue will wait the specified timeout before forcefully shutting down. | ||
# Any job not finished by then will be picked up again after a restart. | ||
config.solid_queue.shutdown_timeout = 10.seconds | ||
# Remove *successful* jobs from the database after 30 days | ||
config.solid_queue.clear_finished_jobs_after = 30.days | ||
config.solid_queue.supervisor_pidfile = Rails.root.join('tmp/pids/solid_queue_supervisor.pid') | ||
|
||
# For Solid Queue, we want to hide regular SQL queries from the console, but still log them to a separate file. | ||
# For the normal webserver, this dedicated setup is neither needed nor desired. | ||
next unless Rake.application.top_level_tasks.to_s.include?('solid_queue:') | ||
|
||
# Specify that all logs should be written to the specified log file | ||
file_name = "#{Rails.env}.solid_queue.log" | ||
config.paths.add 'log', with: "log/#{file_name}" | ||
|
||
# Send all logs regarding SQL queries to the log file. | ||
# This will include all queries performed by Solid Queue including periodic job checks. | ||
log_file = ActiveSupport::Logger.new(Rails.root.join('log', file_name)) | ||
config.active_record.logger = ActiveSupport::BroadcastLogger.new(log_file) | ||
|
||
config.after_initialize do | ||
# Create a new logger that will write to the console | ||
console = ActiveSupport::Logger.new($stdout) | ||
console.level = Rails.logger.level | ||
# Enable this line to have the same log format as Rails.logger | ||
# It will include the job name, the job ID for each line | ||
# console.formatter = Rails.logger.formatter | ||
|
||
ActiveSupport.on_load :solid_queue_record do | ||
# Once SolidQueue is loaded, we can broadcast its logs to the console, too. | ||
# Due to the initialization order, this will effectively start logging once SolidQueue is about to start. | ||
Rails.logger.broadcast_to console | ||
end | ||
end | ||
end |
103 changes: 103 additions & 0 deletions
103
db/migrate/20240609104039_create_solid_queue_tables.solid_queue.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,103 @@ | ||
# frozen_string_literal: true | ||
|
||
# This migration comes from solid_queue (originally 20231211200639) | ||
class CreateSolidQueueTables < ActiveRecord::Migration[7.0] | ||
def change | ||
create_table :solid_queue_jobs do |t| | ||
t.string :queue_name, null: false | ||
t.string :class_name, null: false, index: true | ||
t.text :arguments | ||
t.integer :priority, default: 0, null: false | ||
t.string :active_job_id, index: true | ||
t.datetime :scheduled_at | ||
t.datetime :finished_at, index: true | ||
t.string :concurrency_key | ||
|
||
t.timestamps | ||
|
||
t.index %i[queue_name finished_at], name: 'index_solid_queue_jobs_for_filtering' | ||
t.index %i[scheduled_at finished_at], name: 'index_solid_queue_jobs_for_alerting' | ||
end | ||
|
||
create_table :solid_queue_scheduled_executions do |t| | ||
t.references :job, index: {unique: true}, null: false | ||
t.string :queue_name, null: false | ||
t.integer :priority, default: 0, null: false | ||
t.datetime :scheduled_at, null: false | ||
|
||
t.datetime :created_at, null: false | ||
|
||
t.index %i[scheduled_at priority job_id], name: 'index_solid_queue_dispatch_all' | ||
end | ||
|
||
create_table :solid_queue_ready_executions do |t| | ||
t.references :job, index: {unique: true}, null: false | ||
t.string :queue_name, null: false | ||
t.integer :priority, default: 0, null: false | ||
|
||
t.datetime :created_at, null: false | ||
|
||
t.index %i[priority job_id], name: 'index_solid_queue_poll_all' | ||
t.index %i[queue_name priority job_id], name: 'index_solid_queue_poll_by_queue' | ||
end | ||
|
||
create_table :solid_queue_claimed_executions do |t| | ||
t.references :job, index: {unique: true}, null: false | ||
t.bigint :process_id | ||
t.datetime :created_at, null: false | ||
|
||
t.index %i[process_id job_id] | ||
end | ||
|
||
create_table :solid_queue_blocked_executions do |t| | ||
t.references :job, index: {unique: true}, null: false | ||
t.string :queue_name, null: false | ||
t.integer :priority, default: 0, null: false | ||
t.string :concurrency_key, null: false | ||
t.datetime :expires_at, null: false | ||
|
||
t.datetime :created_at, null: false | ||
|
||
t.index %i[expires_at concurrency_key], name: 'index_solid_queue_blocked_executions_for_maintenance' | ||
end | ||
|
||
create_table :solid_queue_failed_executions do |t| | ||
t.references :job, index: {unique: true}, null: false | ||
t.text :error | ||
t.datetime :created_at, null: false | ||
end | ||
|
||
create_table :solid_queue_pauses do |t| | ||
t.string :queue_name, null: false, index: {unique: true} | ||
t.datetime :created_at, null: false | ||
end | ||
|
||
create_table :solid_queue_processes do |t| | ||
t.string :kind, null: false | ||
t.datetime :last_heartbeat_at, null: false, index: true | ||
t.bigint :supervisor_id, index: true | ||
|
||
t.integer :pid, null: false | ||
t.string :hostname | ||
t.text :metadata | ||
|
||
t.datetime :created_at, null: false | ||
end | ||
|
||
create_table :solid_queue_semaphores do |t| | ||
t.string :key, null: false, index: {unique: true} | ||
t.integer :value, default: 1, null: false | ||
t.datetime :expires_at, null: false, index: true | ||
|
||
t.timestamps | ||
|
||
t.index %i[key value], name: 'index_solid_queue_semaphores_on_key_and_value' | ||
end | ||
|
||
add_foreign_key :solid_queue_blocked_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade | ||
add_foreign_key :solid_queue_claimed_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade | ||
add_foreign_key :solid_queue_failed_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade | ||
add_foreign_key :solid_queue_ready_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade | ||
add_foreign_key :solid_queue_scheduled_executions, :solid_queue_jobs, column: :job_id, on_delete: :cascade | ||
end | ||
end |
8 changes: 8 additions & 0 deletions
8
db/migrate/20240609104040_add_missing_index_to_blocked_executions.solid_queue.rb
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
# frozen_string_literal: true | ||
|
||
# This migration comes from solid_queue (originally 20240110143450) | ||
class AddMissingIndexToBlockedExecutions < ActiveRecord::Migration[7.1] | ||
def change | ||
add_index :solid_queue_blocked_executions, %i[concurrency_key priority job_id], name: 'index_solid_queue_blocked_executions_for_release' | ||
end | ||
end |
Oops, something went wrong.