pgbus 0.7.3 → 0.7.5

data/config/locales/pt.yml

@@ -66,6 +66,12 @@ pt:
       index:
         discard_all: Descartar Tudo
         discard_all_confirm: Descartar permanentemente todas as mensagens DLQ?
+        discard_selected: Descartar Selecionados
+        discard_selected_confirm: Descartar mensagens DLQ selecionadas?
+        discarded_selected:
+          one: 1 mensagem DLQ descartada.
+          other: "%{count} mensagens DLQ descartadas."
+        none_selected: Nenhuma mensagem selecionada.
         retry_all: Tentar Novamente Tudo
         retry_all_confirm: Tentar novamente todas as mensagens DLQ?
         title: Fila de Mensagens Mortas
@@ -113,7 +119,34 @@ pt:
       delete_title: Excluir
       ok: OK
     events:
+      flash:
+        discard_failed: Não foi possível descartar o evento.
+        discarded: Evento descartado.
+        discarded_selected:
+          one: 1 evento descartado.
+          other: "%{count} eventos descartados."
+        mark_handled_failed: Não foi possível marcar o evento como tratado.
+        marked_handled: Evento marcado como tratado.
+        none_selected: Nenhum evento selecionado.
+        payload_update_failed: Não foi possível atualizar o payload. Verifique se o JSON é válido.
+        payload_updated: Payload atualizado e evento reenfileirado.
+        replay_failed: Evento não encontrado ou não pôde ser reproduzido.
+        replayed: Evento reproduzido.
+        reroute_failed: Não foi possível redirecionar o evento.
+        rerouted: Evento redirecionado para o manipulador alvo.
       index:
+        discard_all: Descartar Todos
+        discard_all_confirm: Descartar todos os eventos pendentes? Esta ação não pode ser desfeita.
+        discard_selected: Descartar Selecionados
+        discard_selected_confirm: Descartar eventos selecionados?
+        pending_empty: Nenhum evento pendente
+        pending_headers:
+          enqueued: Enfileirado
+          handler_queue: Fila do Manipulador
+          id: ID
+          reads: Leituras
+          routing_key: Chave de Roteamento
+        pending_title: Eventos Pendentes
         processed_empty: Nenhum evento processado ainda
         processed_headers:
           event_id: ID do evento
@@ -127,6 +160,26 @@ pt:
           queue: Fila
         subscribers_title: Assinantes registrados
         title: Eventos
+      pending_table:
+        arguments: Payload
+        discard: Descartar
+        discard_confirm: Descartar este evento? Ele será arquivado.
+        edit_payload: Editar e Tentar Novamente
+        edit_payload_confirm: Atualizar payload e reenfileirar este evento?
+        edit_payload_label: 'Payload JSON:'
+        event_id: 'ID do Evento:'
+        full_json_payload: Payload JSON Completo
+        headers_section: Cabeçalhos
+        mark_handled: Marcar como Tratado
+        mark_handled_confirm: Marcar este evento como tratado? Ele será arquivado e ignorado na reprodução.
+        metadata: Metadados
+        metadata_labels:
+          last_read: 'Última leitura:'
+          read_count: 'Contagem de leituras:'
+          visible_at: 'Visível em:'
+        reroute: Redirecionar
+        reroute_confirm: Redirecionar este evento para um manipulador diferente?
+        reroute_label: 'Manipulador alvo:'
       show:
         back: Voltar para eventos
         labels:
@@ -136,6 +189,9 @@ pt:
         not_found: Evento não encontrado
         title: Evento %{event_id}
     helpers:
+      bulk_select_all: Selecionar todos
+      bulk_select_row: Selecionar %{id}
+      bulk_selected: selecionado
       paused_badge: Pausado
       queue_badge:
         dlq: DLQ
@@ -150,11 +206,22 @@ pt:
       show:
         charts:
           failed_to_load: Falha ao carregar dados do gráfico
+          latency: Latência da Fila (ms)
+          latency_avg: Média
+          latency_p95: P95
           no_data: Sem dados ainda
           series_name: Tarefas/min
           status_distribution: Distribuição de status
           throughput: Taxa de transferência (tarefas/min)
         description_html: Métricas de desempenho de trabalho para os últimos %{range}
+        latency_by_queue:
+          empty: Ainda não há dados de latência
+          headers:
+            avg: Média (ms)
+            count: Contagem
+            p95: P95 (ms)
+            queue: Fila
+          title: Latência por Fila
         slowest:
           empty: Nenhuma estatística de tarefa ainda
           headers:
@@ -163,11 +230,32 @@ pt:
             job_class: Classe da tarefa
             max: Máximo
           title: Classes de Trabalho Mais Lentas (duração média)
+        streams:
+          summary:
+            active: Ativo
+            avg_fanout: Média de Ramificações
+            broadcasts: Transmissões
+            connects: Conexões
+            disconnects: Desconexões
+          title: Streams em Tempo Real
+          top:
+            empty: Nenhuma atividade de stream registrada na janela selecionada
+            headers:
+              avg_fanout: Média de Ramificações
+              avg_ms: Média de Despacho
+              broadcasts: Transmissões
+              stream: Stream
+            title: Principais Streams por Volume de Transmissão
         summary:
           avg_duration: Duração Média
+          avg_latency: Latência Média
+          avg_retries: Média de Tentativas
           dead_lettered: Cartas Mortas
           failed: Falhou
           max_duration: Duração Máxima
+          p50_latency: Latência P50
+          p95_latency: Latência P95
+          p99_latency: Latência P99
           succeeded: Bem-sucedido
           total_jobs: Total de Trabalhos
         time_ranges:
@@ -222,6 +310,12 @@ pt:
         discard_all: Descartar Todos
         discard_all_confirm: Descartar todos os trabalhos falhados?
         discard_all_enqueued_notice: Descartados %{count} trabalhos na fila e bloqueios liberados.
+        discard_selected: Descartar Selecionados
+        discard_selected_confirm: Descartar itens selecionados?
+        discarded_selected:
+          one: 1 item selecionado descartado.
+          other: "%{count} itens selecionados descartados."
+        none_selected: Nenhum item selecionado.
         retry_all: Tentar Novamente Todos
         retry_all_confirm: Tentar novamente todos os trabalhos falhados?
         title: Trabalhos
@@ -259,13 +353,28 @@ pt:
       toggle_menu: Alternar menu
     locks:
       index:
+        all_locks_discarded:
+          one: 1 bloqueio descartado.
+          other: "%{count} bloqueios descartados."
         description: Bloqueios de exclusividade ativos impedindo a execução duplicada do trabalho
+        discard: Descartar
+        discard_all: Descartar Todos
+        discard_all_confirm: Descartar permanentemente todos os bloqueios? Isso pode permitir a execução duplicada de trabalhos.
+        discard_confirm: Descartar este bloqueio? O trabalho associado pode ser enfileirado novamente.
+        discard_selected: Descartar Selecionados
+        discard_selected_confirm: Descartar bloqueios selecionados?
         empty: Nenhum bloqueio ativo
         headers:
           age: Idade
           lock_key: Chave de Bloqueio
           msg_id: ID da mensagem
           queue_name: Fila
+        lock_discard_failed: Não foi possível descartar o bloqueio.
+        lock_discarded: Bloqueio descartado.
+        locks_discarded:
+          one: 1 bloqueio descartado.
+          other: "%{count} bloqueios descartados."
+        none_selected: Nenhum bloqueio selecionado.
         title: Chaves de unicidade
     outbox:
       index:

data/config/locales/sv.yml

@@ -66,6 +66,12 @@ sv:
       index:
         discard_all: Kassera alla
         discard_all_confirm: Kassera permanent alla DLQ-meddelanden?
+        discard_selected: Kassera valda
+        discard_selected_confirm: Kassera valda DLQ-meddelanden?
+        discarded_selected:
+          one: Kasserade 1 DLQ-meddelande.
+          other: Kasserade %{count} DLQ-meddelanden.
+        none_selected: Inga meddelanden valda.
         retry_all: Försök igen alla
         retry_all_confirm: Försök igen alla DLQ-meddelanden?
         title: Dead Letter-kö
@@ -113,7 +119,34 @@ sv:
       delete_title: Ta bort
       ok: OK
     events:
+      flash:
+        discard_failed: Kunde inte kassera händelsen.
+        discarded: Händelse kasserad.
+        discarded_selected:
+          one: Kasserade 1 händelse.
+          other: Kasserade %{count} händelser.
+        mark_handled_failed: Kunde inte markera händelsen som hanterad.
+        marked_handled: Händelse markerad som hanterad.
+        none_selected: Inga händelser valda.
+        payload_update_failed: Kunde inte uppdatera payload. Kontrollera att JSON är giltig.
+        payload_updated: Payload uppdaterad och händelsen återköad.
+        replay_failed: Händelsen hittades inte eller kunde inte spelas upp.
+        replayed: Händelsen spelades upp.
+        reroute_failed: Kunde inte omdirigera händelsen.
+        rerouted: Händelsen omdirigerades till målhanteraren.
       index:
+        discard_all: Kassera alla
+        discard_all_confirm: Kassera alla väntande händelser? Detta kan inte ångras.
+        discard_selected: Kassera valda
+        discard_selected_confirm: Kassera valda händelser?
+        pending_empty: Inga väntande händelser
+        pending_headers:
+          enqueued: Köad
+          handler_queue: Handler-kö
+          id: ID
+          reads: Läsningar
+          routing_key: Routing-nyckel
+        pending_title: Väntande händelser
         processed_empty: Inga händelser behandlade än
         processed_headers:
           event_id: Händelse-ID
@@ -127,6 +160,26 @@ sv:
           queue: Kö
         subscribers_title: Registrerade prenumeranter
         title: Händelser
+      pending_table:
+        arguments: Payload
+        discard: Kassera
+        discard_confirm: Kassera denna händelse? Den kommer att arkiveras.
+        edit_payload: Redigera & Försök igen
+        edit_payload_confirm: Uppdatera payload och återköa denna händelse?
+        edit_payload_label: 'JSON Payload:'
+        event_id: 'Händelse-ID:'
+        full_json_payload: Fullständig JSON Payload
+        headers_section: Headers
+        mark_handled: Markera som hanterad
+        mark_handled_confirm: Markera denna händelse som hanterad? Den kommer att arkiveras och hoppas över vid uppspelning.
+        metadata: Metadata
+        metadata_labels:
+          last_read: 'Senast läst:'
+          read_count: 'Läsantal:'
+          visible_at: 'Synlig vid:'
+        reroute: Omdirigera
+        reroute_confirm: Omdirigera denna händelse till en annan hanterare?
+        reroute_label: 'Målhanterare:'
       show:
         back: Tillbaka till händelser
         labels:
@@ -136,6 +189,9 @@ sv:
         not_found: Händelse hittades inte
         title: Händelse %{event_id}
     helpers:
+      bulk_select_all: Markera alla
+      bulk_select_row: Markera %{id}
+      bulk_selected: valda
       paused_badge: Pausad
       queue_badge:
         dlq: DLQ
@@ -150,11 +206,22 @@ sv:
       show:
         charts:
           failed_to_load: Misslyckades att ladda diagramdata
+          latency: Köfördröjning (ms)
+          latency_avg: Genomsnitt
+          latency_p95: P95
           no_data: Inga data än
           series_name: Jobb/min
           status_distribution: Statusfördelning
           throughput: Genomströmning (jobb/min)
         description_html: Jobbprestandamått för de senaste %{range}
+        latency_by_queue:
+          empty: Ingen fördröjningsdata än
+          headers:
+            avg: Genomsnitt (ms)
+            count: Antal
+            p95: P95 (ms)
+            queue: Kö
+          title: Fördröjning per kö
         slowest:
           empty: Inga jobbstatistik än
           headers:
@@ -163,11 +230,32 @@ sv:
             job_class: Jobbklass
             max: Max
           title: Långsammaste jobbklasser (genomsnittlig varaktighet)
+        streams:
+          summary:
+            active: Aktiv
+            avg_fanout: Genomsnittlig spridning
+            broadcasts: Sändningar
+            connects: Anslutningar
+            disconnects: Frånkopplingar
+          title: Strömmar i realtid
+          top:
+            empty: Ingen strömaktivitet registrerad i det valda fönstret
+            headers:
+              avg_fanout: Genomsnittlig spridning
+              avg_ms: Genomsnittlig utsändning
+              broadcasts: Sändningar
+              stream: Ström
+            title: Toppströmmar efter sändningsvolym
         summary:
           avg_duration: Genomsnittlig varaktighet
+          avg_latency: Genomsnittlig fördröjning
+          avg_retries: Genomsnittliga omförsök
           dead_lettered: Dead Lettered
           failed: Misslyckades
           max_duration: Maximal varaktighet
+          p50_latency: P50-fördröjning
+          p95_latency: P95-fördröjning
+          p99_latency: P99-fördröjning
           succeeded: Lyckades
           total_jobs: Totalt antal jobb
         time_ranges:
@@ -222,6 +310,12 @@ sv:
         discard_all: Kassera alla
         discard_all_confirm: Kassera alla misslyckade jobb?
         discard_all_enqueued_notice: Kasserade %{count} köade jobb och frigjorde deras lås.
+        discard_selected: Kassera valda
+        discard_selected_confirm: Kassera valda objekt?
+        discarded_selected:
+          one: Kasserade 1 valt objekt.
+          other: Kasserade %{count} valda objekt.
+        none_selected: Inga objekt valda.
         retry_all: Försök igen alla
         retry_all_confirm: Försök igen alla misslyckade jobb?
         title: Jobb
@@ -259,13 +353,28 @@ sv:
       toggle_menu: Växla meny
     locks:
       index:
+        all_locks_discarded:
+          one: Kasserade 1 lås.
+          other: Kasserade %{count} lås.
         description: Aktiva unika lås som förhindrar duplicerad jobbexekvering
+        discard: Kassera
+        discard_all: Kassera alla
+        discard_all_confirm: Kassera alla lås permanent? Detta kan tillåta duplicerad jobbexekvering.
+        discard_confirm: Kassera detta lås? Det associerade jobbet kan köas igen.
+        discard_selected: Kassera valda
+        discard_selected_confirm: Kassera valda lås?
         empty: Inga aktiva lås
         headers:
           age: Ålder
           lock_key: Låsningsnyckel
           msg_id: Meddelande-ID
           queue_name: Kö
+        lock_discard_failed: Kunde inte kassera lås.
+        lock_discarded: Lås kasserat.
+        locks_discarded:
+          one: Kasserade 1 lås.
+          other: Kasserade %{count} lås.
+        none_selected: Inga lås valda.
         title: Unikhetsnycklar
     outbox:
       index:

data/config/routes.rb

@@ -50,6 +50,13 @@ Pgbus::Engine.routes.draw do
   resources :events, only: %i[index show] do
     member do
       post :replay
+      post :discard
+      post :mark_handled
+      post :edit_payload
+      post :reroute
+    end
+    collection do
+      post :discard_selected
     end
   end
 

data/lib/generators/pgbus/templates/migration.rb.erb

@@ -156,6 +156,11 @@ class CreatePgbusTables < ActiveRecord::Migration<%= migration_version %>
     # queue processing and concurrency lock management.
     execute Pgbus::AutovacuumTuning.sql_for_all_queues
     execute Pgbus::AutovacuumTuning.sql_for_high_churn_tables
+
+    # Set fillfactor on queue tables to reduce bloat from PGMQ's read
+    # UPDATE operations (vt, read_ct, last_read_at). Lower fillfactor
+    # reserves page space, reducing page density during heavy update churn.
+    execute Pgbus::TableMaintenance.fillfactor_sql_for_all_queues
   end
 
   def down

data/lib/generators/pgbus/templates/tune_fillfactor.rb.erb

@@ -0,0 +1,30 @@
+class TunePgbusFillfactor < ActiveRecord::Migration<%= migration_version %>
+  def up
+    # Set fillfactor on queue tables to reduce bloat from PGMQ's read
+    # UPDATE operations. PGMQ updates vt, read_ct, and last_read_at on
+    # every read — with fillfactor=100 (default), pages fill completely
+    # between vacuum passes. Lowering fillfactor reserves page space,
+    # reducing page density during heavy update churn. Note: because vt
+    # is indexed, these updates are not HOT-eligible.
+    #
+    # Archive tables are append-only (INSERT from queue, DELETE on
+    # retention) and don't benefit from fillfactor tuning.
+    #
+    # New queues created after this migration automatically receive
+    # this setting via Pgbus::Client at queue creation time.
+    execute Pgbus::TableMaintenance.fillfactor_sql_for_all_queues
+  end
+
+  def down
+    execute <<~SQL
+      DO $$
+      DECLARE
+        q RECORD;
+      BEGIN
+        FOR q IN SELECT queue_name FROM pgmq.meta LOOP
+          EXECUTE format('ALTER TABLE pgmq.q_%I RESET (fillfactor)', q.queue_name);
+        END LOOP;
+      END $$;
+    SQL
+  end
+end

data/lib/generators/pgbus/tune_fillfactor_generator.rb

@@ -0,0 +1,51 @@
+# frozen_string_literal: true
+
+require "rails/generators"
+require "rails/generators/active_record"
+require_relative "migration_path"
+
+module Pgbus
+  module Generators
+    class TuneFillfactorGenerator < Rails::Generators::Base
+      include ActiveRecord::Generators::Migration
+      include MigrationPath
+
+      source_root File.expand_path("templates", __dir__)
+
+      desc "Set fillfactor on PGMQ queue tables to reduce page density and bloat"
+
+      class_option :database,
+                   type: :string,
+                   default: nil,
+                   desc: "Use a separate database for pgbus tables (e.g. --database=pgbus)"
+
+      def create_migration_file
+        migration_template "tune_fillfactor.rb.erb",
+                           File.join(pgbus_migrate_path, "tune_pgbus_fillfactor.rb")
+      end
+
+      def display_post_install
+        say ""
+        say "Pgbus fillfactor tuning migration created!", :green
+        say ""
+        say "This migration sets fillfactor=#{Pgbus::TableMaintenance::FILLFACTOR} on all existing"
+        say "PGMQ queue tables. This reserves #{100 - Pgbus::TableMaintenance::FILLFACTOR}% of each page to"
+        say "reduce page density during PGMQ's heavy read UPDATE churn."
+        say ""
+        say "New queues created at runtime will automatically receive"
+        say "this setting."
+        say ""
+        say "Next steps:"
+        say "  1. Run: rails db:migrate#{":#{options[:database]}" if separate_database?}"
+        say "  2. Restart pgbus: bin/pgbus start"
+        say ""
+      end
+
+      private
+
+      def migration_version
+        "[#{ActiveRecord::Migration.current_version}]"
+      end
+    end
+  end
+end

data/lib/pgbus/client.rb

@@ -87,7 +87,9 @@ module Pgbus
       target = @queue_strategy.target_queue(queue_name, priority)
       ensure_queue(queue_name)
       Instrumentation.instrument("pgbus.client.send_message", queue: target) do
-        synchronized { @pgmq.produce(target, serialize(payload), headers: headers && serialize(headers), delay: delay) }
+        with_stale_connection_retry do
+          synchronized { @pgmq.produce(target, serialize(payload), headers: headers && serialize(headers), delay: delay) }
+        end
       end
     end
 
@@ -96,7 +98,9 @@ module Pgbus
       ensure_queue(queue_name)
       serialized, serialized_headers = serialize_batch(payloads, headers)
       Instrumentation.instrument("pgbus.client.send_batch", queue: full_name, size: payloads.size) do
-        synchronized { @pgmq.produce_batch(full_name, serialized, headers: serialized_headers, delay: delay) }
+        with_stale_connection_retry do
+          synchronized { @pgmq.produce_batch(full_name, serialized, headers: serialized_headers, delay: delay) }
+        end
       end
     end
 
@@ -318,13 +322,15 @@ module Pgbus
     end
 
     def publish_to_topic(routing_key, payload, headers: nil, delay: 0)
-      synchronized do
-        @pgmq.produce_topic(
-          routing_key,
-          serialize(payload),
-          headers: headers && serialize(headers),
-          delay: delay
-        )
+      with_stale_connection_retry do
+        synchronized do
+          @pgmq.produce_topic(
+            routing_key,
+            serialize(payload),
+            headers: headers && serialize(headers),
+            delay: delay
+          )
+        end
       end
     end
 
@@ -502,6 +508,7 @@ module Pgbus
     def tune_autovacuum(queue_name)
       with_raw_connection do |conn|
         conn.exec(AutovacuumTuning.sql_for_queue(queue_name))
+        conn.exec(TableMaintenance.fillfactor_sql_for_queue(queue_name))
       end
     rescue StandardError => e
       Pgbus.logger.debug { "[Pgbus::Client] Autovacuum tuning failed for #{queue_name}: #{e.message}" }
@@ -518,6 +525,51 @@ module Pgbus
       end
     end
 
+    # Substrings that indicate the pooled PG::Connection was already dead
+    # *before* pgmq-ruby tried to use it — typically killed by a connection
+    # pooler (PgBouncer server_idle_timeout / client_idle_timeout), an admin
+    # disconnect, or a TCP RST while the slot was idle.
+    #
+    # Only pre-checkout / pre-flight errors belong here. Mid-flight errors
+    # like "server closed the connection" or "connection to server was lost"
+    # are excluded because PG may have already committed the INSERT before
+    # the socket died, and retrying would duplicate the message.
+    #
+    # See mensfeld/pgmq-ruby#94.
+    STALE_CONNECTION_PATTERNS = [
+      "pqsocket() can't get socket descriptor",
+      "connection is closed",
+      "connection has been closed",
+      "connection not open",
+      "no connection to the server"
+    ].freeze
+    private_constant :STALE_CONNECTION_PATTERNS
+
+    # Enqueue path guard: rescue PGMQ::Errors::ConnectionError once if its
+    # message matches a known stale-socket pattern. pgmq-ruby's
+    # auto_reconnect + verify_connection! already recovers on the *next*
+    # checkout, so a single retry is sufficient. Other connection errors
+    # (pool timeout, misconfiguration, truly unreachable DB) propagate.
+    def with_stale_connection_retry
+      attempts = 0
+      begin
+        yield
+      rescue PGMQ::Errors::ConnectionError => e
+        attempts += 1
+        raise unless attempts == 1 && stale_connection_error?(e)
+
+        Pgbus.logger.warn do
+          "[Pgbus::Client] Retrying produce after stale pgmq connection: #{e.message}"
+        end
+        retry
+      end
+    end
+
+    def stale_connection_error?(error)
+      message = error.message.to_s.downcase
+      STALE_CONNECTION_PATTERNS.any? { |pattern| message.include?(pattern) }
+    end
+
     def serialize(data)
       case data
       when String

data/lib/pgbus/configuration.rb

@@ -78,6 +78,7 @@ module Pgbus
 
     # Recurring jobs
     attr_accessor :recurring_tasks, :recurring_schedule_interval, :recurring_tasks_file, :skip_recurring
+    attr_writer :recurring_tasks_files
     attr_reader :recurring_execution_retention # rubocop:disable Style/AccessorGrouping
 
     # Multi-database support (optional separate database for pgbus tables)
@@ -161,6 +162,7 @@ module Pgbus
       @recurring_tasks = nil
       @recurring_schedule_interval = 1.0
       @recurring_tasks_file = nil
+      @recurring_tasks_files = nil
       @skip_recurring = false
       @recurring_execution_retention = 7 * 24 * 3600 # 7 days
 
@@ -492,6 +494,12 @@ module Pgbus
       @recurring_execution_retention = coerce_duration!(value, :recurring_execution_retention)
     end
 
+    def recurring_tasks_files
+      return @recurring_tasks_files if @recurring_tasks_files
+
+      recurring_tasks_file ? [recurring_tasks_file] : nil
+    end
+
     # Returns the connection pool size to use for the PGMQ client.
     #
     # If +pool_size+ was explicitly set, returns that value unchanged. Otherwise

data/lib/pgbus/engine.rb

@@ -18,10 +18,22 @@ module Pgbus
     end
 
     initializer "pgbus.recurring" do |app|
-      recurring_path = app.root.join("config", "recurring.yml")
-      if recurring_path.exist? && !Pgbus.configuration.recurring_tasks
-        Pgbus.configuration.recurring_tasks = Pgbus::Recurring::ConfigLoader.load(recurring_path)
-        Pgbus.configuration.recurring_tasks_file ||= recurring_path.to_s
+      next if Pgbus.configuration.recurring_tasks
+
+      config = Pgbus.configuration
+      files = config.recurring_tasks_files
+      default_path = app.root.join("config", "recurring.yml")
+
+      if files
+        tasks = Pgbus::Recurring::ConfigLoader.load_all(files)
+        if tasks.empty? && default_path.exist? && files.none? { |f| File.expand_path(f.to_s) == File.expand_path(default_path.to_s) }
+          tasks = Pgbus::Recurring::ConfigLoader.load(default_path)
+          config.recurring_tasks_file ||= default_path.to_s
+        end
+        config.recurring_tasks = tasks unless tasks.empty?
+      elsif default_path.exist?
+        config.recurring_tasks = Pgbus::Recurring::ConfigLoader.load(default_path)
+        config.recurring_tasks_file ||= default_path.to_s
       end
     end
 

data/lib/pgbus/event_bus/publisher.rb

@@ -8,7 +8,7 @@ module Pgbus
       module_function
 
       def publish(routing_key, payload, headers: nil, delay: 0)
-        event_data = build_event_data(payload)
+        event_data = build_event_data(payload, routing_key: routing_key)
 
         if defined?(Pgbus::Testing) && !Pgbus::Testing.disabled?
           event = Pgbus::Event.new(
@@ -37,7 +37,7 @@ module Pgbus
         publish(routing_key, payload, headers: headers, delay: delay)
       end
 
-      def build_event_data(payload)
+      def build_event_data(payload, routing_key: nil)
         event_id = SecureRandom.uuid
 
         serialized_payload = if payload.respond_to?(:to_global_id)
@@ -48,11 +48,13 @@ module Pgbus
                                { "value" => payload }
                              end
 
-        {
+        data = {
           "event_id" => event_id,
           "payload" => serialized_payload,
           "published_at" => Time.now.utc.iso8601(6)
         }
+        data["routing_key"] = routing_key if routing_key
+        data
       end
     end
   end