pgbus 0.1.3 → 0.1.5

data/lib/pgbus/web/data_source.rb

@@ -7,6 +7,8 @@ module Pgbus
     class DataSource
       def initialize(client: Pgbus.client)
         @client = client
+        @last_throughput_snapshot = nil
+        @last_throughput_at = nil
       end
 
       # Dashboard summary
@@ -17,6 +19,8 @@ module Pgbus
         dlq_suffix = Pgbus.configuration.dead_letter_queue_suffix
         dlq_depth = queues.select { |q| q[:name].end_with?(dlq_suffix) }.sum { |q| q[:queue_length] }
 
+        throughput = compute_throughput(queues)
+
         {
           total_queues: queues.size,
           total_depth: total_depth,
@@ -24,7 +28,8 @@ module Pgbus
           active_processes: processes.count,
           failed_count: failed_events_count,
           dlq_depth: dlq_depth,
-          recurring_count: recurring_tasks_count
+          recurring_count: recurring_tasks_count,
+          throughput_rate: throughput
         }
       end
 
@@ -33,7 +38,10 @@ module Pgbus
       # different connection lifecycle than the worker processes).
       def queues_with_metrics
         queue_names = connection.select_values("SELECT queue_name FROM pgmq.meta ORDER BY queue_name")
-        queue_names.map { |name| queue_metrics_via_sql(name) }.compact
+        paused_queues = paused_queue_names
+        queue_names.map { |name| queue_metrics_via_sql(name) }.compact.map do |q|
+          q.merge(paused: paused_queues.include?(logical_queue_name(q[:name])))
+        end
       rescue StandardError => e
         Pgbus.logger.error { "[Pgbus::Web] Error fetching queue metrics: #{e.class}: #{e.message}" }
         []
@@ -52,6 +60,24 @@ module Pgbus
         @client.purge_queue(name)
       end
 
+      def pause_queue(name, reason: nil)
+        QueueState.pause!(logical_queue_name(name), reason: reason)
+      rescue StandardError => e
+        Pgbus.logger.error { "[Pgbus::Web] Error pausing queue #{name}: #{e.message}" }
+      end
+
+      def resume_queue(name)
+        QueueState.resume!(logical_queue_name(name))
+      rescue StandardError => e
+        Pgbus.logger.error { "[Pgbus::Web] Error resuming queue #{name}: #{e.message}" }
+      end
+
+      def queue_paused?(name)
+        QueueState.paused?(logical_queue_name(name))
+      rescue StandardError
+        false
+      end
+
       # Jobs (messages in queue tables)
       def jobs(queue_name: nil, page: 1, per_page: 25)
         offset = (page - 1) * per_page
@@ -451,6 +477,26 @@ module Pgbus
         0
       end
 
+      # Outbox
+      def outbox_stats
+        {
+          unpublished: OutboxEntry.unpublished.count,
+          total: OutboxEntry.count,
+          oldest_unpublished_age: oldest_unpublished_age
+        }
+      rescue StandardError => e
+        Pgbus.logger.debug { "[Pgbus::Web] Error fetching outbox stats: #{e.message}" }
+        { unpublished: 0, total: 0, oldest_unpublished_age: nil }
+      end
+
+      def outbox_entries(page: 1, per_page: 25)
+        offset = (page - 1) * per_page
+        OutboxEntry.order(id: :desc).limit(per_page).offset(offset).to_a
+      rescue StandardError => e
+        Pgbus.logger.debug { "[Pgbus::Web] Error fetching outbox entries: #{e.message}" }
+        []
+      end
+
       # Subscriber registry
       def registered_subscribers
         EventBus::Registry.instance.subscribers.map do |s|
@@ -571,6 +617,45 @@ module Pgbus
         sanitized
       end
 
+      def compute_throughput(queues)
+        current_totals = queues.sum { |q| q[:total_messages] }
+        now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+
+        if @last_throughput_snapshot && @last_throughput_at
+          elapsed = now - @last_throughput_at
+          delta = current_totals - @last_throughput_snapshot
+          rate = elapsed.positive? ? (delta / elapsed).round(1) : 0.0
+        end
+
+        @last_throughput_snapshot = current_totals
+        @last_throughput_at = now
+
+        rate || 0.0
+      rescue StandardError
+        0.0
+      end
+
+      def logical_queue_name(name)
+        name
+          .delete_prefix("#{Pgbus.configuration.queue_prefix}_")
+          .sub(/_p\d+\z/, "")
+      end
+
+      def paused_queue_names
+        QueueState.paused.pluck(:queue_name)
+      rescue StandardError
+        []
+      end
+
+      def oldest_unpublished_age
+        oldest = OutboxEntry.unpublished.order(:id).pick(:created_at)
+        return nil unless oldest
+
+        (Time.now - oldest).to_i
+      rescue StandardError
+        nil
+      end
+
       def parse_arguments(args)
         case args
         when Array then args

data/lib/pgbus.rb

@@ -18,16 +18,33 @@ module Pgbus
         loader.inflector.inflect("pgbus" => "Pgbus", "cli" => "CLI", "dsl" => "DSL")
         loader.ignore("#{__dir__}/generators")
         loader.ignore("#{__dir__}/active_job")
-        # Register app/models for non-Rails usage (specs, standalone).
-        # When Rails is running, the Engine handles autoloading app/models.
-        unless defined?(Rails::Engine)
-          models_dir = File.expand_path("../app/models", __dir__)
-          loader.push_dir(models_dir) if File.directory?(models_dir)
-        end
         loader
       end
     end
 
+    # Separate loader for app/models used only in non-Rails contexts (specs,
+    # standalone scripts). When the Engine boots, Rails' autoloader takes over
+    # app/models and this loader is torn down to avoid conflicts.
+    def models_loader
+      models_dir = File.expand_path("../app/models", __dir__)
+      return nil unless File.directory?(models_dir)
+
+      @models_loader ||= begin
+        loader = Zeitwerk::Loader.new
+        loader.tag = "pgbus-models"
+        loader.push_dir(models_dir)
+        loader.setup
+        loader
+      end
+    end
+
+    def teardown_models_loader!
+      return unless @models_loader
+
+      @models_loader.unregister
+      @models_loader = nil
+    end
+
     def configuration
       @configuration ||= Configuration.new
     end
@@ -46,12 +63,24 @@ module Pgbus
       @configuration = nil
     end
 
+    # Discard the inherited PGMQ client after fork.
+    # Do NOT call close — the parent's @pgmq_mutex is in undefined
+    # state post-fork and attempting to acquire it can deadlock.
+    # The next call to Pgbus.client will lazily create a fresh one.
+    def reset_client!
+      @client = nil
+    end
+
     def logger
       configuration.logger
     end
   end
 
   loader.setup
+
+  # In non-Rails contexts, set up model autoloading via a separate loader.
+  # This is torn down by the Engine initializer when Rails boots.
+  models_loader unless defined?(Rails::Engine)
 end
 
 require "active_job/queue_adapters/pgbus_adapter" if defined?(ActiveJob)

data/lib/tasks/pgbus_pgmq.rake

@@ -12,8 +12,10 @@ namespace :pgbus do
       latest = Pgbus::PgmqSchema.latest_version
       puts "Vendored version:  #{latest}"
 
-      if ActiveRecord::Base.connection.table_exists?("pgbus_pgmq_schema_versions")
-        row = ActiveRecord::Base.connection.select_one(
+      conn = Pgbus.configuration.connects_to ? Pgbus::ApplicationRecord.connection : ActiveRecord::Base.connection
+
+      if conn.table_exists?("pgbus_pgmq_schema_versions")
+        row = conn.select_one(
           "SELECT version, install_method, installed_at FROM pgbus_pgmq_schema_versions ORDER BY installed_at DESC LIMIT 1"
         )
         if row
@@ -32,7 +34,7 @@ namespace :pgbus do
         end
       else
         # Check if pgmq schema exists at all
-        schema_exists = ActiveRecord::Base.connection.select_value(
+        schema_exists = conn.select_value(
           "SELECT 1 FROM information_schema.schemata WHERE schema_name = 'pgmq'"
         )
         if schema_exists

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Mikael Henriksson
@@ -113,6 +113,7 @@ files:
 - app/controllers/pgbus/dead_letter_controller.rb
 - app/controllers/pgbus/events_controller.rb
 - app/controllers/pgbus/jobs_controller.rb
+- app/controllers/pgbus/outbox_controller.rb
 - app/controllers/pgbus/processes_controller.rb
 - app/controllers/pgbus/queues_controller.rb
 - app/controllers/pgbus/recurring_tasks_controller.rb
@@ -120,8 +121,10 @@ files:
 - app/models/pgbus/application_record.rb
 - app/models/pgbus/batch_entry.rb
 - app/models/pgbus/blocked_execution.rb
+- app/models/pgbus/outbox_entry.rb
 - app/models/pgbus/process_entry.rb
 - app/models/pgbus/processed_event.rb
+- app/models/pgbus/queue_state.rb
 - app/models/pgbus/recurring_execution.rb
 - app/models/pgbus/recurring_task.rb
 - app/models/pgbus/semaphore.rb
@@ -140,6 +143,7 @@ files:
 - app/views/pgbus/jobs/_failed_table.html.erb
 - app/views/pgbus/jobs/index.html.erb
 - app/views/pgbus/jobs/show.html.erb
+- app/views/pgbus/outbox/index.html.erb
 - app/views/pgbus/processes/_processes_table.html.erb
 - app/views/pgbus/processes/index.html.erb
 - app/views/pgbus/queues/_queues_list.html.erb
@@ -151,8 +155,12 @@ files:
 - config/routes.rb
 - exe/pgbus
 - lib/active_job/queue_adapters/pgbus_adapter.rb
+- lib/generators/pgbus/add_outbox_generator.rb
+- lib/generators/pgbus/add_queue_states_generator.rb
 - lib/generators/pgbus/add_recurring_generator.rb
 - lib/generators/pgbus/install_generator.rb
+- lib/generators/pgbus/templates/add_outbox.rb.erb
+- lib/generators/pgbus/templates/add_queue_states.rb.erb
 - lib/generators/pgbus/templates/add_recurring_tables.rb.erb
 - lib/generators/pgbus/templates/migration.rb.erb
 - lib/generators/pgbus/templates/pgbus.yml.erb
@@ -164,6 +172,7 @@ files:
 - lib/pgbus/active_job/adapter.rb
 - lib/pgbus/active_job/executor.rb
 - lib/pgbus/batch.rb
+- lib/pgbus/circuit_breaker.rb
 - lib/pgbus/cli.rb
 - lib/pgbus/client.rb
 - lib/pgbus/concurrency.rb
@@ -171,6 +180,7 @@ files:
 - lib/pgbus/concurrency/semaphore.rb
 - lib/pgbus/config_loader.rb
 - lib/pgbus/configuration.rb
+- lib/pgbus/dedup_cache.rb
 - lib/pgbus/engine.rb
 - lib/pgbus/event.rb
 - lib/pgbus/event_bus/handler.rb
@@ -178,14 +188,18 @@ files:
 - lib/pgbus/event_bus/registry.rb
 - lib/pgbus/event_bus/subscriber.rb
 - lib/pgbus/instrumentation.rb
+- lib/pgbus/outbox.rb
+- lib/pgbus/outbox/poller.rb
 - lib/pgbus/pgmq_schema.rb
 - lib/pgbus/pgmq_schema/pgmq_v1.11.0.sql
 - lib/pgbus/process/consumer.rb
 - lib/pgbus/process/dispatcher.rb
 - lib/pgbus/process/heartbeat.rb
+- lib/pgbus/process/lifecycle.rb
 - lib/pgbus/process/signal_handler.rb
 - lib/pgbus/process/supervisor.rb
 - lib/pgbus/process/worker.rb
+- lib/pgbus/rate_counter.rb
 - lib/pgbus/recurring/already_recorded.rb
 - lib/pgbus/recurring/command_job.rb
 - lib/pgbus/recurring/config_loader.rb