diff --git a/app/jobs/instance_cleanup_job.rb b/app/jobs/instance_cleanup_job.rb new file mode 100644 index 0000000..22383d6 --- /dev/null +++ b/app/jobs/instance_cleanup_job.rb @@ -0,0 +1,13 @@ +class InstanceCleanupJob < ApplicationJob + queue_as :default + + def perform(*args) + instances = Instance.all + to_be_deleted = instances.filter { |i| + # Mark instances older than 2 days for deletion + (Time.now.utc - i.created_at) / 2.days >= 1 + } + Instance.where(id: to_be_deleted.map { |m| m.id }).destroy_all + print "#{to_be_deleted.length} instances destroyed\n" + end +end diff --git a/app/models/instance.rb b/app/models/instance.rb index 04ba99d..e581c65 100644 --- a/app/models/instance.rb +++ b/app/models/instance.rb @@ -1,6 +1,6 @@ class Instance < ApplicationRecord - has_many :pops - has_many :fairies + has_many :pops, dependent: :destroy + has_many :fairies, dependent: :destroy validates :zone, inclusion: { in: %w[anemos pagos pyros hydatos] } end diff --git a/config/database.yml b/config/database.yml index af5637f..608d9d8 100644 --- a/config/database.yml +++ b/config/database.yml @@ -21,8 +21,14 @@ default: &default development: - <<: *default - database: ecoffee_development + primary: + <<: *default + database: ecoffee_development + queue: + <<: *default + database: ecoffee_development_queue + migrations_paths: db/queue_migrate + # The specified database role being used to connect to PostgreSQL. # To create additional roles in PostgreSQL see `$ createuser --help`. diff --git a/config/environments/development.rb b/config/environments/development.rb index 4cc21c4..fa97ae4 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -54,6 +54,9 @@ Rails.application.configure do # Highlight code that enqueued background job in logs. config.active_job.verbose_enqueue_logs = true + config.active_job.queue_adapter = :solid_queue + config.active_job.verbose_enqueue_logs = true + config.solid_queue.connects_to = { database: { writing: :queue } } # Raises error for missing translations. # config.i18n.raise_on_missing_translations = true diff --git a/config/recurring.yml b/config/recurring.yml index d045b19..134e004 100644 --- a/config/recurring.yml +++ b/config/recurring.yml @@ -1,10 +1,8 @@ -# production: -# periodic_cleanup: -# class: CleanSoftDeletedRecordsJob -# queue: background -# args: [ 1000, { batch_size: 500 } ] -# schedule: every hour -# periodic_command: -# command: "SoftDeletedRecord.due.delete_all" -# priority: 2 -# schedule: at 5am every day +production: + periodic_cleanup: + class: InstanceCleanupJob + schedule: every 2 days at 10:00am +development: + periodic_cleanup: + class: InstanceCleanupJob + schedule: every 30 seconds diff --git a/db/queue_schema.rb b/db/queue_schema.rb index 85194b6..089e938 100644 --- a/db/queue_schema.rb +++ b/db/queue_schema.rb @@ -1,4 +1,19 @@ -ActiveRecord::Schema[7.1].define(version: 1) do +# This file is auto-generated from the current state of the database. Instead +# of editing this file, please use the migrations feature of Active Record to +# incrementally modify your database, and then regenerate this schema definition. +# +# This file is the source Rails uses to define your schema when running `bin/rails +# db:schema:load`. When creating a new database, `bin/rails db:schema:load` tends to +# be faster and is potentially less error prone than running all of your +# migrations from scratch. Old migrations may fail to apply correctly if those +# migrations use external dependencies or application code. +# +# It's strongly recommended that you check this file into your version control system. + +ActiveRecord::Schema[8.0].define(version: 1) do + # These are extensions that must be enabled in order to support this database + enable_extension "pg_catalog.plpgsql" + create_table "solid_queue_blocked_executions", force: :cascade do |t| t.bigint "job_id", null: false t.string "queue_name", null: false @@ -6,24 +21,24 @@ ActiveRecord::Schema[7.1].define(version: 1) do t.string "concurrency_key", null: false t.datetime "expires_at", null: false t.datetime "created_at", null: false - t.index [ "concurrency_key", "priority", "job_id" ], name: "index_solid_queue_blocked_executions_for_release" - t.index [ "expires_at", "concurrency_key" ], name: "index_solid_queue_blocked_executions_for_maintenance" - t.index [ "job_id" ], name: "index_solid_queue_blocked_executions_on_job_id", unique: true + t.index ["concurrency_key", "priority", "job_id"], name: "index_solid_queue_blocked_executions_for_release" + t.index ["expires_at", "concurrency_key"], name: "index_solid_queue_blocked_executions_for_maintenance" + t.index ["job_id"], name: "index_solid_queue_blocked_executions_on_job_id", unique: true end create_table "solid_queue_claimed_executions", force: :cascade do |t| t.bigint "job_id", null: false t.bigint "process_id" t.datetime "created_at", null: false - t.index [ "job_id" ], name: "index_solid_queue_claimed_executions_on_job_id", unique: true - t.index [ "process_id", "job_id" ], name: "index_solid_queue_claimed_executions_on_process_id_and_job_id" + t.index ["job_id"], name: "index_solid_queue_claimed_executions_on_job_id", unique: true + t.index ["process_id", "job_id"], name: "index_solid_queue_claimed_executions_on_process_id_and_job_id" end create_table "solid_queue_failed_executions", force: :cascade do |t| t.bigint "job_id", null: false t.text "error" t.datetime "created_at", null: false - t.index [ "job_id" ], name: "index_solid_queue_failed_executions_on_job_id", unique: true + t.index ["job_id"], name: "index_solid_queue_failed_executions_on_job_id", unique: true end create_table "solid_queue_jobs", force: :cascade do |t| @@ -37,17 +52,17 @@ ActiveRecord::Schema[7.1].define(version: 1) do t.string "concurrency_key" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index [ "active_job_id" ], name: "index_solid_queue_jobs_on_active_job_id" - t.index [ "class_name" ], name: "index_solid_queue_jobs_on_class_name" - t.index [ "finished_at" ], name: "index_solid_queue_jobs_on_finished_at" - t.index [ "queue_name", "finished_at" ], name: "index_solid_queue_jobs_for_filtering" - t.index [ "scheduled_at", "finished_at" ], name: "index_solid_queue_jobs_for_alerting" + t.index ["active_job_id"], name: "index_solid_queue_jobs_on_active_job_id" + t.index ["class_name"], name: "index_solid_queue_jobs_on_class_name" + t.index ["finished_at"], name: "index_solid_queue_jobs_on_finished_at" + t.index ["queue_name", "finished_at"], name: "index_solid_queue_jobs_for_filtering" + t.index ["scheduled_at", "finished_at"], name: "index_solid_queue_jobs_for_alerting" end create_table "solid_queue_pauses", force: :cascade do |t| t.string "queue_name", null: false t.datetime "created_at", null: false - t.index [ "queue_name" ], name: "index_solid_queue_pauses_on_queue_name", unique: true + t.index ["queue_name"], name: "index_solid_queue_pauses_on_queue_name", unique: true end create_table "solid_queue_processes", force: :cascade do |t| @@ -59,9 +74,9 @@ ActiveRecord::Schema[7.1].define(version: 1) do t.text "metadata" t.datetime "created_at", null: false t.string "name", null: false - t.index [ "last_heartbeat_at" ], name: "index_solid_queue_processes_on_last_heartbeat_at" - t.index [ "name", "supervisor_id" ], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true - t.index [ "supervisor_id" ], name: "index_solid_queue_processes_on_supervisor_id" + t.index ["last_heartbeat_at"], name: "index_solid_queue_processes_on_last_heartbeat_at" + t.index ["name", "supervisor_id"], name: "index_solid_queue_processes_on_name_and_supervisor_id", unique: true + t.index ["supervisor_id"], name: "index_solid_queue_processes_on_supervisor_id" end create_table "solid_queue_ready_executions", force: :cascade do |t| @@ -69,9 +84,9 @@ ActiveRecord::Schema[7.1].define(version: 1) do t.string "queue_name", null: false t.integer "priority", default: 0, null: false t.datetime "created_at", null: false - t.index [ "job_id" ], name: "index_solid_queue_ready_executions_on_job_id", unique: true - t.index [ "priority", "job_id" ], name: "index_solid_queue_poll_all" - t.index [ "queue_name", "priority", "job_id" ], name: "index_solid_queue_poll_by_queue" + t.index ["job_id"], name: "index_solid_queue_ready_executions_on_job_id", unique: true + t.index ["priority", "job_id"], name: "index_solid_queue_poll_all" + t.index ["queue_name", "priority", "job_id"], name: "index_solid_queue_poll_by_queue" end create_table "solid_queue_recurring_executions", force: :cascade do |t| @@ -79,8 +94,8 @@ ActiveRecord::Schema[7.1].define(version: 1) do t.string "task_key", null: false t.datetime "run_at", null: false t.datetime "created_at", null: false - t.index [ "job_id" ], name: "index_solid_queue_recurring_executions_on_job_id", unique: true - t.index [ "task_key", "run_at" ], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true + t.index ["job_id"], name: "index_solid_queue_recurring_executions_on_job_id", unique: true + t.index ["task_key", "run_at"], name: "index_solid_queue_recurring_executions_on_task_key_and_run_at", unique: true end create_table "solid_queue_recurring_tasks", force: :cascade do |t| @@ -95,8 +110,8 @@ ActiveRecord::Schema[7.1].define(version: 1) do t.text "description" t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index [ "key" ], name: "index_solid_queue_recurring_tasks_on_key", unique: true - t.index [ "static" ], name: "index_solid_queue_recurring_tasks_on_static" + t.index ["key"], name: "index_solid_queue_recurring_tasks_on_key", unique: true + t.index ["static"], name: "index_solid_queue_recurring_tasks_on_static" end create_table "solid_queue_scheduled_executions", force: :cascade do |t| @@ -105,8 +120,8 @@ ActiveRecord::Schema[7.1].define(version: 1) do t.integer "priority", default: 0, null: false t.datetime "scheduled_at", null: false t.datetime "created_at", null: false - t.index [ "job_id" ], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true - t.index [ "scheduled_at", "priority", "job_id" ], name: "index_solid_queue_dispatch_all" + t.index ["job_id"], name: "index_solid_queue_scheduled_executions_on_job_id", unique: true + t.index ["scheduled_at", "priority", "job_id"], name: "index_solid_queue_dispatch_all" end create_table "solid_queue_semaphores", force: :cascade do |t| @@ -115,9 +130,9 @@ ActiveRecord::Schema[7.1].define(version: 1) do t.datetime "expires_at", null: false t.datetime "created_at", null: false t.datetime "updated_at", null: false - t.index [ "expires_at" ], name: "index_solid_queue_semaphores_on_expires_at" - t.index [ "key", "value" ], name: "index_solid_queue_semaphores_on_key_and_value" - t.index [ "key" ], name: "index_solid_queue_semaphores_on_key", unique: true + t.index ["expires_at"], name: "index_solid_queue_semaphores_on_expires_at" + t.index ["key", "value"], name: "index_solid_queue_semaphores_on_key_and_value" + t.index ["key"], name: "index_solid_queue_semaphores_on_key", unique: true end add_foreign_key "solid_queue_blocked_executions", "solid_queue_jobs", column: "job_id", on_delete: :cascade diff --git a/fly.toml b/fly.toml index 9863fcb..6e039c1 100644 --- a/fly.toml +++ b/fly.toml @@ -14,6 +14,7 @@ PORT = '8080' [processes] app = './bin/rails server' +jobs = "./bin/jobs start" [deploy] release_command = "./bin/rails db:prepare" diff --git a/test/jobs/instance_cleanup_job_test.rb b/test/jobs/instance_cleanup_job_test.rb new file mode 100644 index 0000000..6c4e7b4 --- /dev/null +++ b/test/jobs/instance_cleanup_job_test.rb @@ -0,0 +1,7 @@ +require "test_helper" + +class InstanceCleanupJobTest < ActiveJob::TestCase + # test "the truth" do + # assert true + # end +end