pgbus 0.6.8 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4d9e527a08c8660868590840ae8f3f311e9f4d7fe20f1f2b83018c9cc30d904
-  data.tar.gz: 9113b68be4f3772f74488e4229685220a1daa649d3d8726d2fd044afbe1b070a
+  metadata.gz: dca12989cdb8d34cd026facd0ecb71cc9df51fb966135806a858e1c4bdb0f7cc
+  data.tar.gz: 4f94274ec1bda644087f5711f2a75f8b1c70f5840f5e0d1d9a1b7ea137f6e3ea
 SHA512:
-  metadata.gz: 745010fa781503049ab585e6cc08b21420b8d118017be91eaab35d3c94c681836ff5f98c99d5f099fce5249cb45fc7d8b725e06dc569d1c040084a6b2d086911
-  data.tar.gz: 50df9a8d99532bf4efa3c03dd0be48e24f123f8ea937f0f7475ff8dfcf1d0242267568f426bdcc76089bacdd1538926b748f032ff977841b08f3665723e4c792
+  metadata.gz: decefd5c55ee2f4ca0c1aa6d52e1e1732f89ba3e789a0ae64c6b0bbd1cf60fe0d0c138dc87398f0a80b5e28d7e5cd7cd09eb44e2265265265adcfd9c0ee829f5
+  data.tar.gz: ad140f317e5de14558842881f2dd428281a8fb141986e7d8099976969a2d85b87dd08e7d01f64ebf5128f5b3174dd485b7af5c1f8d00b07bb4037ec095256c8c

data/README.md

@@ -23,6 +23,7 @@ PostgreSQL-native job processing and event bus for Rails, built on [PGMQ](https:
   - [Circuit breaker and queue pause/resume](#circuit-breaker-and-queue-pauseresume)
   - [Prefetch flow control](#prefetch-flow-control)
   - [Worker recycling](#worker-recycling)
+  - [Retry backoff](#retry-backoff)
 - [Routing and ordering](#routing-and-ordering)
   - [Priority queues](#priority-queues)
   - [Consumer priority](#consumer-priority)
@@ -31,6 +32,10 @@ PostgreSQL-native job processing and event bus for Rails, built on [PGMQ](https:
   - [Batches](#batches)
   - [Transactional outbox](#transactional-outbox)
   - [Archive compaction](#archive-compaction)
+- [Observability](#observability)
+  - [Error reporting](#error-reporting)
+  - [Structured logging](#structured-logging)
+  - [Queue health monitoring](#queue-health-monitoring)
 - [Real-time broadcasts](#real-time-broadcasts-turbo-streams-replacement)
 - [Operations](#operations)
   - [CLI](#cli)
@@ -63,6 +68,10 @@ PostgreSQL-native job processing and event bus for Rails, built on [PGMQ](https:
 - **Single active consumer** -- advisory-lock-based exclusive queue processing for strict ordering
 - **Consumer priority** -- higher-priority workers get first dibs, lower-priority workers back off
 - **Job uniqueness** -- prevent duplicate jobs with reaper-based crash recovery, no TTL-driven expiry
+- **Retry backoff** -- exponential backoff with jitter for VT-based retries, per-job overrides
+- **Error reporting** -- pluggable error reporters for APM integration (Appsignal, Sentry, etc.)
+- **Structured logging** -- JSON log formatter with component extraction and thread-local context
+- **Queue health** -- dead tuple monitoring, autovacuum tuning, Prometheus metrics
 
 ## Requirements
 
@@ -463,6 +472,34 @@ end
 
 When a limit is hit, the worker drains its thread pool, exits, and the supervisor forks a fresh process. RSS memory is sampled from `/proc/self/statm` (Linux) or `ps -o rss` (macOS).
 
+### Retry backoff
+
+When a job fails, Pgbus extends the PGMQ visibility timeout with exponential backoff so retries are spread out instead of bunched at fixed intervals:
+
+```ruby
+Pgbus.configure do |config|
+  config.retry_backoff     = 5       # base delay (seconds)
+  config.retry_backoff_max = 300     # cap at 5 minutes
+  config.retry_backoff_jitter = 0.15 # +-15% randomization
+end
+```
+
+The delay formula is `base * 2^(attempt-1) * (1 + random_jitter)`. For a job that fails 4 times with defaults: ~5s, ~10s, ~20s, ~40s before hitting DLQ on the 5th read.
+
+Jobs can override the global settings per-class:
+
+```ruby
+class FragileApiJob < ApplicationJob
+  include Pgbus::RetryBackoff::JobMixin
+
+  pgbus_retry_backoff base: 10, max: 600, jitter: 0.2
+
+  def perform(...)
+    # ...
+  end
+end
+```
+
 ### Async execution mode (fibers)
 
 Workers can optionally execute jobs as fibers instead of threads. This is ideal for I/O-bound workloads (HTTP calls, email delivery, LLM API calls) where jobs spend most of their time waiting on network I/O.
@@ -662,6 +699,96 @@ as configuration. The dispatcher runs archive compaction as part of its
 maintenance loop, deleting archived messages older than `archive_retention`
 in batches to avoid long-running transactions.
 
+## Observability
+
+Error reporting, structured logging, and queue health monitoring.
+
+### Error reporting
+
+By default, Pgbus logs caught exceptions and continues. To route them to your APM service (Appsignal, Sentry, Honeybadger, etc.), push callable reporters onto `config.error_reporters`:
+
+```ruby
+Pgbus.configure do |c|
+  c.error_reporters << ->(ex, ctx) {
+    Appsignal.set_error(ex) { |t| t.set_tags(ctx) }
+  }
+end
+```
+
+Each reporter receives `(exception, context_hash)`. The context hash includes keys like `action`, `queue`, `job_class`, and `msg_id` depending on the call site. Reporters that accept a third argument also receive the Pgbus configuration object.
+
+Reporters are wired into all critical rescue paths: job execution failures, worker fetch/process errors, dispatcher maintenance, supervisor fork failures, circuit breaker trips, outbox publish errors, and failed event recording. Non-critical paths (dashboard queries, stat recording) remain log-only.
+
+`ErrorReporter.report` is guaranteed to never raise — if a reporter or the logger itself throws, the error is swallowed silently. This preserves fault-tolerance invariants at every rescue site.
+
+### Structured logging
+
+Pgbus ships two log formatters inspired by Sidekiq's `Logger::Formatters`:
+
+```ruby
+Pgbus.configure do |c|
+  c.log_format = :json   # or :text (default)
+end
+```
+
+**Text format** (default):
+
+```text
+INFO 2025-01-15T10:30:00.000Z pid=1234 tid=abc queue=default: Starting job
+```
+
+**JSON format**:
+
+```json
+{"ts":"2025-01-15T10:30:00.000Z","pid":1234,"tid":"abc","lvl":"INFO","component":"Pgbus","msg":"Starting job","ctx":{"queue":"default"}}
+```
+
+The JSON formatter extracts `[Pgbus]` and `[Pgbus::Web]` prefixes from log messages into a separate `component` field so the `msg` field stays clean for log aggregators. Thread-local context can be added via `Pgbus::LogFormatter.with_context(queue: "default") { ... }` and appears under the `ctx` key.
+
+You can also set a formatter directly on the logger:
+
+```ruby
+Pgbus.configure do |c|
+  c.logger.formatter = Pgbus::LogFormatter::JSON.new
+end
+```
+
+### Queue health monitoring
+
+The dashboard includes a **Queue Health** panel showing PostgreSQL vacuum stats per PGMQ table: dead tuple counts, live tuple counts, bloat ratio (dead / total), last vacuum age, and MVCC horizon age. The same stats appear on individual queue detail pages.
+
+#### Autovacuum tuning
+
+PGMQ queue tables have high insert/delete churn that overwhelms PostgreSQL's default autovacuum settings. Pgbus applies aggressive per-table tuning automatically:
+
+- **New queues at runtime**: `Client#ensure_single_queue` applies tuning after `pgmq.create()`
+- **Existing installations**: `rails generate pgbus:update` detects untuned tables
+- **Fresh installs**: The install migration includes tuning for the default queue
+
+To apply tuning manually or after `db:schema:load` (which loses `ALTER TABLE` settings):
+
+```bash
+rails generate pgbus:tune_autovacuum                  # Generate migration
+rails generate pgbus:tune_autovacuum --database=pgbus # For separate database
+```
+
+The `pgbus:tune_autovacuum` rake task also hooks into `db:schema:load` automatically.
+
+#### Prometheus metrics
+
+When `config.metrics_enabled = true` (default), the dashboard exposes Prometheus-compatible gauges:
+
+| Metric | Description |
+|--------|-------------|
+| `pgbus_table_dead_tuples` | Dead tuple count per PGMQ table |
+| `pgbus_table_live_tuples` | Live tuple count per PGMQ table |
+| `pgbus_table_bloat_ratio` | Dead / (dead + live) per table |
+| `pgbus_table_last_vacuum_age_seconds` | Seconds since last vacuum per table |
+| `pgbus_oldest_transaction_age_seconds` | MVCC horizon pin risk |
+| `pgbus_worker_pool_capacity` | Total worker thread slots |
+| `pgbus_worker_pool_busy` | Currently busy worker threads |
+| `pgbus_worker_pool_utilization` | Busy / capacity ratio |
+
 ## Real-time broadcasts (turbo-streams replacement)
 
 Pgbus ships a drop-in replacement for turbo-rails' `turbo_stream_from` helper that fixes several well-known ActionCable correctness bugs by using PGMQ message IDs as a replay cursor. Same API as turbo-rails. No Redis. No ActionCable. No lost messages on reconnect.
@@ -751,6 +878,34 @@ One Puma worker (or Falcon reactor) hosts one `Pgbus::Web::Streamer::Instance` s
 
 Per-stream retention is handled by the main pgbus dispatcher process on the same interval as the dispatcher's `ARCHIVE_COMPACTION_INTERVAL` constant. Streams default to a 5-minute retention because SSE clients reconnect within seconds; chat-style applications override the retention to days via `streams_retention`.
 
+### Stream name helpers
+
+Apps using UUID primary keys with turbo-rails-style dom IDs can hit PGMQ's 47-character queue-name ceiling (`"gid://app/Ai::Chat/9c14e8b2-...:messages"` exceeds the limit before the `pgbus_` prefix is even added). Pgbus provides helpers to generate short, collision-safe stream names:
+
+```ruby
+# In your ApplicationRecord
+class ApplicationRecord < ActiveRecord::Base
+  primary_abstract_class
+  include Pgbus::Streams::Streamable
+end
+```
+
+This gives every model `short_id` (16-hex SHA-256 prefix of the GlobalID) and `to_stream_key`:
+
+```ruby
+chat = Ai::Chat.find("9c14e8b2-...")
+chat.short_id        # => "ai_chat_a3f8c1e9d2b47610"
+chat.to_stream_key   # => "ai_chat_a3f8c1e9d2b47610"
+
+# Compose multi-part stream names
+Pgbus.stream_key(chat, :messages)  # => "ai_chat_a3f8c1e9d2b47610_messages"
+
+# Use in views
+<%= pgbus_stream_from Pgbus.stream_key(@chat, :messages) %>
+```
+
+The budget is computed from `config.queue_prefix` at call time so prefix overrides adjust automatically. If a stream name exceeds the budget, `Pgbus::Streams::StreamNameTooLong` is raised immediately with the offending name, computed budget, and a pointer to `Pgbus.stream_key` — before PGMQ is ever touched.
+
 ### Transactional broadcasts
 
 **This is the feature no other Rails real-time stack can offer.** A broadcast issued inside an open ActiveRecord transaction is deferred until the transaction commits. If it rolls back, the broadcast silently drops — clients never see the change that the database never persisted.
@@ -1001,6 +1156,8 @@ Pgbus uses these tables (created via PGMQ and migrations):
 | `pgbus_outbox_entries` | Transactional outbox entries pending publication |
 | `pgbus_recurring_tasks` | Recurring job definitions |
 | `pgbus_recurring_executions` | Recurring job execution history |
+| `pgbus_presence_members` | Stream presence tracking (who is subscribed) |
+| `pgbus_stream_stats` | Stream broadcast/connect/disconnect metrics (opt-in) |
 
 ### Switching from another backend
 
@@ -1058,6 +1215,9 @@ PostgreSQL + PGMQ
 | `polling_interval` | `0.1` | Seconds between polls (LISTEN/NOTIFY is primary) |
 | `visibility_timeout` | `30` | Time before unacked message becomes visible again. Accepts seconds or `ActiveSupport::Duration` (e.g. `10.minutes`) |
 | `max_retries` | `5` | Failed reads before routing to dead letter queue |
+| `retry_backoff` | `5` | Base delay in seconds for VT-based retry backoff (exponential: `base * 2^(attempt-1)`) |
+| `retry_backoff_max` | `300` | Maximum retry delay in seconds (caps the exponential curve) |
+| `retry_backoff_jitter` | `0.15` | Jitter factor (0-1) added to retry delays to spread retries |
 | `max_jobs_per_worker` | `nil` | Recycle worker after N jobs (nil = unlimited) |
 | `max_memory_mb` | `nil` | Recycle worker when memory exceeds N MB |
 | `max_worker_lifetime` | `nil` | Recycle worker after N seconds. Accepts seconds or Duration. |
@@ -1080,6 +1240,12 @@ PostgreSQL + PGMQ
 | `web_live_updates` | `true` | Enable Turbo Frames auto-refresh on dashboard |
 | `stats_enabled` | `true` | Record job execution stats for insights dashboard |
 | `stats_retention` | `30.days` | How long to keep job stats. Accepts seconds, Duration, or `nil` to disable cleanup |
+| `streams_stats_enabled` | `false` | Record stream broadcast/connect/disconnect stats (opt-in, can be high volume) |
+| `streams_path` | `nil` | Custom URL path for the SSE endpoint (nil = auto-detected from engine mount) |
+| `execution_mode` | `:threads` | Global execution mode (`:threads` or `:async`). Per-worker override via capsule config. |
+| `error_reporters` | `[]` | Array of callables invoked on caught exceptions. Each receives `(exception, context_hash)`. |
+| `log_format` | `:text` | Log formatter (`:text` or `:json`). Sets `logger.formatter` automatically. |
+| `metrics_enabled` | `true` | Enable Prometheus-compatible metrics on the dashboard |
 
 ## Development
 

data/lib/generators/pgbus/add_failed_events_index_generator.rb

@@ -2,11 +2,13 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "migration_path"
 
 module Pgbus
   module Generators
     class AddFailedEventsIndexGenerator < Rails::Generators::Base
       include ActiveRecord::Generators::Migration
+      include MigrationPath
 
       source_root File.expand_path("templates", __dir__)
 
@@ -18,13 +20,8 @@ module Pgbus
                    desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
 
       def create_migration_file
-        if separate_database?
-          migration_template "add_failed_events_unique_index.rb.erb",
-                             "db/pgbus_migrate/add_pgbus_failed_events_unique_index.rb"
-        else
-          migration_template "add_failed_events_unique_index.rb.erb",
-                             "db/migrate/add_pgbus_failed_events_unique_index.rb"
-        end
+        migration_template "add_failed_events_unique_index.rb.erb",
+                           File.join(pgbus_migrate_path, "add_pgbus_failed_events_unique_index.rb")
       end
 
       def display_post_install
@@ -42,10 +39,6 @@ module Pgbus
       def migration_version
         "[#{ActiveRecord::Migration.current_version}]"
       end
-
-      def separate_database?
-        options[:database].present?
-      end
     end
   end
 end

data/lib/generators/pgbus/add_job_locks_generator.rb

@@ -2,11 +2,13 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "migration_path"
 
 module Pgbus
   module Generators
     class AddJobLocksGenerator < Rails::Generators::Base
       include ActiveRecord::Generators::Migration
+      include MigrationPath
 
       source_root File.expand_path("templates", __dir__)
 
@@ -18,13 +20,8 @@ module Pgbus
                    desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
 
       def create_migration_file
-        if separate_database?
-          migration_template "add_job_locks.rb.erb",
-                             "db/pgbus_migrate/add_pgbus_job_locks.rb"
-        else
-          migration_template "add_job_locks.rb.erb",
-                             "db/migrate/add_pgbus_job_locks.rb"
-        end
+        migration_template "add_job_locks.rb.erb",
+                           File.join(pgbus_migrate_path, "add_pgbus_job_locks.rb")
       end
 
       def display_post_install
@@ -43,10 +40,6 @@ module Pgbus
       def migration_version
         "[#{ActiveRecord::Migration.current_version}]"
       end
-
-      def separate_database?
-        options[:database].present?
-      end
     end
   end
 end

data/lib/generators/pgbus/add_job_stats_generator.rb

@@ -2,11 +2,13 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "migration_path"
 
 module Pgbus
   module Generators
     class AddJobStatsGenerator < Rails::Generators::Base
       include ActiveRecord::Generators::Migration
+      include MigrationPath
 
       source_root File.expand_path("templates", __dir__)
 
@@ -18,13 +20,8 @@ module Pgbus
                    desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
 
       def create_migration_file
-        if separate_database?
-          migration_template "add_job_stats.rb.erb",
-                             "db/pgbus_migrate/add_pgbus_job_stats.rb"
-        else
-          migration_template "add_job_stats.rb.erb",
-                             "db/migrate/add_pgbus_job_stats.rb"
-        end
+        migration_template "add_job_stats.rb.erb",
+                           File.join(pgbus_migrate_path, "add_pgbus_job_stats.rb")
       end
 
       def display_post_install
@@ -43,10 +40,6 @@ module Pgbus
       def migration_version
         "[#{ActiveRecord::Migration.current_version}]"
       end
-
-      def separate_database?
-        options[:database].present?
-      end
     end
   end
 end

data/lib/generators/pgbus/add_job_stats_latency_generator.rb

@@ -2,11 +2,13 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "migration_path"
 
 module Pgbus
   module Generators
     class AddJobStatsLatencyGenerator < Rails::Generators::Base
       include ActiveRecord::Generators::Migration
+      include MigrationPath
 
       source_root File.expand_path("templates", __dir__)
 
@@ -18,13 +20,8 @@ module Pgbus
                    desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
 
       def create_migration_file
-        if separate_database?
-          migration_template "add_job_stats_latency.rb.erb",
-                             "db/pgbus_migrate/add_pgbus_job_stats_latency.rb"
-        else
-          migration_template "add_job_stats_latency.rb.erb",
-                             "db/migrate/add_pgbus_job_stats_latency.rb"
-        end
+        migration_template "add_job_stats_latency.rb.erb",
+                           File.join(pgbus_migrate_path, "add_pgbus_job_stats_latency.rb")
       end
 
       def display_post_install
@@ -43,10 +40,6 @@ module Pgbus
       def migration_version
         "[#{ActiveRecord::Migration.current_version}]"
       end
-
-      def separate_database?
-        options[:database].present?
-      end
     end
   end
 end

data/lib/generators/pgbus/add_job_stats_queue_index_generator.rb

@@ -2,11 +2,13 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "migration_path"
 
 module Pgbus
   module Generators
     class AddJobStatsQueueIndexGenerator < Rails::Generators::Base
       include ActiveRecord::Generators::Migration
+      include MigrationPath
 
       source_root File.expand_path("templates", __dir__)
 
@@ -18,13 +20,8 @@ module Pgbus
                    desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
 
       def create_migration_file
-        if separate_database?
-          migration_template "add_job_stats_queue_index.rb.erb",
-                             "db/pgbus_migrate/add_pgbus_job_stats_queue_index.rb"
-        else
-          migration_template "add_job_stats_queue_index.rb.erb",
-                             "db/migrate/add_pgbus_job_stats_queue_index.rb"
-        end
+        migration_template "add_job_stats_queue_index.rb.erb",
+                           File.join(pgbus_migrate_path, "add_pgbus_job_stats_queue_index.rb")
       end
 
       def display_post_install
@@ -44,10 +41,6 @@ module Pgbus
       def migration_version
         "[#{ActiveRecord::Migration.current_version}]"
       end
-
-      def separate_database?
-        options[:database].present?
-      end
     end
   end
 end

data/lib/generators/pgbus/add_outbox_generator.rb

@@ -2,11 +2,13 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "migration_path"
 
 module Pgbus
   module Generators
     class AddOutboxGenerator < Rails::Generators::Base
       include ActiveRecord::Generators::Migration
+      include MigrationPath
 
       source_root File.expand_path("templates", __dir__)
 
@@ -18,13 +20,8 @@ module Pgbus
                    desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
 
       def create_migration_file
-        if separate_database?
-          migration_template "add_outbox.rb.erb",
-                             "db/pgbus_migrate/add_pgbus_outbox.rb"
-        else
-          migration_template "add_outbox.rb.erb",
-                             "db/migrate/add_pgbus_outbox.rb"
-        end
+        migration_template "add_outbox.rb.erb",
+                           File.join(pgbus_migrate_path, "add_pgbus_outbox.rb")
       end
 
       def display_post_install
@@ -43,10 +40,6 @@ module Pgbus
       def migration_version
         "[#{ActiveRecord::Migration.current_version}]"
       end
-
-      def separate_database?
-        options[:database].present?
-      end
     end
   end
 end

data/lib/generators/pgbus/add_presence_generator.rb

@@ -2,11 +2,13 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "migration_path"
 
 module Pgbus
   module Generators
     class AddPresenceGenerator < Rails::Generators::Base
       include ActiveRecord::Generators::Migration
+      include MigrationPath
 
       source_root File.expand_path("templates", __dir__)
 
@@ -18,13 +20,8 @@ module Pgbus
                    desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
 
       def create_migration_file
-        if separate_database?
-          migration_template "add_presence.rb.erb",
-                             "db/pgbus_migrate/add_pgbus_presence.rb"
-        else
-          migration_template "add_presence.rb.erb",
-                             "db/migrate/add_pgbus_presence.rb"
-        end
+        migration_template "add_presence.rb.erb",
+                           File.join(pgbus_migrate_path, "add_pgbus_presence.rb")
       end
 
       def display_post_install
@@ -46,10 +43,6 @@ module Pgbus
       def migration_version
         "[#{ActiveRecord::Migration.current_version}]"
       end
-
-      def separate_database?
-        options[:database].present?
-      end
     end
   end
 end

data/lib/generators/pgbus/add_queue_states_generator.rb

@@ -2,11 +2,13 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "migration_path"
 
 module Pgbus
   module Generators
     class AddQueueStatesGenerator < Rails::Generators::Base
       include ActiveRecord::Generators::Migration
+      include MigrationPath
 
       source_root File.expand_path("templates", __dir__)
 
@@ -18,13 +20,8 @@ module Pgbus
                    desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
 
       def create_migration_file
-        if separate_database?
-          migration_template "add_queue_states.rb.erb",
-                             "db/pgbus_migrate/add_pgbus_queue_states.rb"
-        else
-          migration_template "add_queue_states.rb.erb",
-                             "db/migrate/add_pgbus_queue_states.rb"
-        end
+        migration_template "add_queue_states.rb.erb",
+                           File.join(pgbus_migrate_path, "add_pgbus_queue_states.rb")
       end
 
       def display_post_install
@@ -42,10 +39,6 @@ module Pgbus
       def migration_version
         "[#{ActiveRecord::Migration.current_version}]"
       end
-
-      def separate_database?
-        options[:database].present?
-      end
     end
   end
 end

data/lib/generators/pgbus/add_recurring_generator.rb

@@ -2,11 +2,13 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "migration_path"
 
 module Pgbus
   module Generators
     class AddRecurringGenerator < Rails::Generators::Base
       include ActiveRecord::Generators::Migration
+      include MigrationPath
 
       source_root File.expand_path("templates", __dir__)
 
@@ -18,13 +20,8 @@ module Pgbus
                    desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
 
       def create_migration_file
-        if separate_database?
-          migration_template "add_recurring_tables.rb.erb",
-                             "db/pgbus_migrate/add_pgbus_recurring_tables.rb"
-        else
-          migration_template "add_recurring_tables.rb.erb",
-                             "db/migrate/add_pgbus_recurring_tables.rb"
-        end
+        migration_template "add_recurring_tables.rb.erb",
+                           File.join(pgbus_migrate_path, "add_pgbus_recurring_tables.rb")
       end
 
       def create_recurring_config
@@ -47,10 +44,6 @@ module Pgbus
       def migration_version
         "[#{ActiveRecord::Migration.current_version}]"
       end
-
-      def separate_database?
-        options[:database].present?
-      end
     end
   end
 end

data/lib/generators/pgbus/add_stream_stats_generator.rb

@@ -2,11 +2,13 @@
 
 require "rails/generators"
 require "rails/generators/active_record"
+require_relative "migration_path"
 
 module Pgbus
   module Generators
     class AddStreamStatsGenerator < Rails::Generators::Base
       include ActiveRecord::Generators::Migration
+      include MigrationPath
 
       source_root File.expand_path("templates", __dir__)
 
@@ -18,13 +20,8 @@ module Pgbus
                    desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
 
       def create_migration_file
-        if separate_database?
-          migration_template "add_stream_stats.rb.erb",
-                             "db/pgbus_migrate/add_pgbus_stream_stats.rb"
-        else
-          migration_template "add_stream_stats.rb.erb",
-                             "db/migrate/add_pgbus_stream_stats.rb"
-        end
+        migration_template "add_stream_stats.rb.erb",
+                           File.join(pgbus_migrate_path, "add_pgbus_stream_stats.rb")
       end
 
       def display_post_install
@@ -45,10 +42,6 @@ module Pgbus
       def migration_version
         "[#{ActiveRecord::Migration.current_version}]"
       end
-
-      def separate_database?
-        options[:database].present?
-      end
     end
   end
 end