wal 0.0.31 → 0.0.33

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebd8285e94c341f2e9c14bc71f7c80177153eddc82ab55fe302ddfa9c8f420fc
-  data.tar.gz: 261f5c87be8a50e074fb445c70a3ef1f04fdb95a98800d2e4408b28dda14c1cf
+  metadata.gz: 79eda85dc0f833f81fc5c4778b7f8333559308f46111758e09977ec3dc98461c
+  data.tar.gz: 470232c05cf0dc4ee5d55448ce6b88aa57373c53f504dda3526482a3473d3dbc
 SHA512:
-  metadata.gz: '0840147d093d96603562fbdd2ea081c52f8760d6eb51cb666effa904a0b5bc710fccabaefd08c56bafff2e903cd7ad227b55ab408b27c97b48387a9151778d48'
-  data.tar.gz: 22c894fbfe102e3340b6dfd60603b42bb285178155c65a1887e44434af55e68d23ed548cbc52f4e7cabafb5e9ac3aa8a882ad60350b635645478242f04db374c
+  metadata.gz: e30d85d2e335ab143daa5de2962912009a340ba279ab47e4f531e6577ada0eb2cca22148f10601d75fc992bbb35cf8b081ebc02b698189d1ab4f841029367254
+  data.tar.gz: 262104fb88bd6cb51ad181f9d8bea74e25d9f9798a5f04969ec33c29d71ccd9c9fb4cd22ba2b089075c5a4458d028597c5cfabe24a5086578bd297b67598be76

data/exe/wal

@@ -7,7 +7,7 @@ begin
     Usage:
       wal watch --watcher <watcher-class>
         (--slot <replication-slot> | --tmp-slot)
-        [--publication=<publication>...]
+        --publication <publication>...
         [--replicator <replicator-class>]
       wal start <config-file>
 
@@ -16,7 +16,7 @@ begin
       --watcher=<watcher-class>          The watcher class to be used to listen for WAL changes.
       --slot=<replication-slot>          The replication slot that will be used.
       --tmp-slot                         Use a temporary replication slot.
-      [--publication=<publication>...]   Force using the informed Postgres publications.
+      [--publication=<publication>...]   Postgres publications to subscribe to.
       [--replicator=<replicatior_class>] Change the replication driver class
   DOCOPT
 rescue Docopt::Exit => err
@@ -28,24 +28,18 @@ require "./config/environment"
 
 db_config = ActiveRecord::Base.configurations.configs_for(name: "primary").configuration_hash
 
-def watch(db_config, cli)
-  watcher = cli["--watcher"].constantize.new
-  use_temporary_slot = cli["--tmp-slot"] || false
-  replication_slot = cli["--slot"]
-  replication_slot = replication_slot.presence || "wal_watcher_#{SecureRandom.alphanumeric(4)}" if use_temporary_slot
-  publications = cli["--publication"] || []
-  replicator_class = cli["--replicator"].presence&.constantize || Wal::Replicator
-
-  puts "Watcher started for #{replication_slot} slot (#{publications.join(", ")})"
-  replicator_class
-    .new(replication_slot:, use_temporary_slot:, db_config:)
-    .replicate_forever(Wal::LoggingWatcher.new(replication_slot, watcher), publications:)
-  puts "Watcher finished for #{replication_slot}"
-end
-
 if cli["watch"]
-  watch(db_config, cli)
+  config = {
+    "watcher" => cli["--watcher"],
+    "temporary" => cli["--tmp-slot"],
+    "publications" => cli["--publication"] || [],
+    "replicator" => cli["--replicator"],
+  }
+  slot = cli["--slot"].presence || "wal_watcher_#{SecureRandom.alphanumeric(4)}"
+  runner = Wal::Runner.new(config: { "slots" => { slot => config } }, db_config:)
+  runner.start
 elsif cli["start"]
-  runner = Wal::Runner.new(config_file: cli["<config-file>"], db_config:)
+  config = YAML.load_file(cli["<config-file>"])
+  runner = Wal::Runner.new(config:, db_config:)
   runner.start
 end

data/lib/wal/logging_watcher.rb

@@ -5,6 +5,8 @@ module Wal
     def initialize(slot, watcher)
       @slot = slot
       @watcher = watcher
+      @actions = Set.new
+      @tables = Set.new
     end
 
     def should_watch_table?(table)
@@ -26,17 +28,27 @@ module Wal
       when Wal::CommitTransactionEvent
         if @count > 0
           elapsed = ((Time.now - @start) * 1000.0).round(1)
-          Wal.logger&.info("[#{@slot}] Commit transaction=#{event.transaction_id} elapsed=#{elapsed} events=#{@count}")
+          actions = " actions=#{@actions.sort.join(",")}" unless @actions.empty?
+          tables = " tables=#{@tables.sort.join(",")}" unless @tables.empty?
+          Wal.logger&.info("[#{@slot}] Commit transaction=#{event.transaction_id} elapsed=#{elapsed} events=#{@count}#{actions}#{tables}")
         end
+        @actions.clear
+        @tables.clear
       when Wal::InsertEvent
         Wal.logger&.debug("[#{@slot}] Insert transaction=#{event.transaction_id} table=#{event.table} primary_key=#{event.primary_key}")
         @count += 1
+        @actions << :insert
+        @tables << event.table
       when Wal::UpdateEvent
         Wal.logger&.debug("[#{@slot}] Update transaction=#{event.transaction_id} table=#{event.table} primary_key=#{event.primary_key}")
         @count += 1
+        @actions << :update
+        @tables << event.table
       when Wal::DeleteEvent
         Wal.logger&.debug("[#{@slot}] Delete transaction=#{event.transaction_id} table=#{event.table} primary_key=#{event.primary_key}")
         @count += 1
+        @actions << :delete
+        @tables << event.table
       else
         @count += 1
       end

data/lib/wal/runner.rb

@@ -23,6 +23,7 @@ module Wal
         temporary = config["temporary"] || false
         publications = config["publications"] || []
         replicator_class = config["replicator"].presence&.constantize || Wal::Replicator
+        replicator_params = config["replicator_params"]&.transform_keys(&:to_sym) || {}
         auto_restart = config["auto_restart"].nil? || config["auto_restart"]
         max_retries = config["retries"]&.to_i || (2**32 - 1)
         backoff = config["retry_backoff"]&.to_f || 1
@@ -35,7 +36,7 @@ module Wal
 
           begin
             replicator_class
-              .new(replication_slot:, use_temporary_slot:, db_config:)
+              .new(db_config:, **replicator_params, replication_slot:, use_temporary_slot:)
               .replicate_forever(Wal::LoggingWatcher.new(replication_slot, watcher), publications:)
             if auto_restart
               backoff_time = backoff_exponent ? (backoff * retries) ** backoff_exponent : backoff
@@ -44,6 +45,8 @@ module Wal
               puts "Restarting #{replication_slot}"
               redo
             end
+          rescue ArgumentError
+            raise
           rescue StandardError => err
             if retries < max_retries
               Wal.logger&.error("[#{replication_slot}] Error #{err}")
@@ -76,18 +79,32 @@ module Wal
       end
     end
 
-    attr_reader :config_file, :db_config
+    attr_reader :config, :db_config
 
-    def initialize(config_file:, db_config:)
-      @config_file = config_file
+    def initialize(config:, db_config:)
+      @config = config
       @db_config = db_config
       @child_pids = []
     end
 
     def start
-      slots = YAML.load_file(config_file)["slots"]
-      workers_slots = slots.group_by { |_slot, config| config["worker"] || "default" }
+      workers_slots = config["slots"].group_by { |_slot, slot_config| slot_config["worker"] || "default" }
+
+      if workers_slots.size == 1
+        run_single_worker(workers_slots.first)
+      else
+        run_forked_workers(workers_slots)
+      end
+    end
+
+    def run_single_worker((worker_name, slot_configs))
+      @ping_thread = start_ping_thread
+      puts "[#{worker_name}] Starting worker process (PID: #{Process.pid})"
+      worker = Worker.new(name: worker_name, slot_configs: slot_configs, db_config: db_config)
+      worker.run
+    end
 
+    def run_forked_workers(workers_slots)
       Wal.fork_hooks[:before_fork]&.call
 
       workers_slots.each do |worker_name, slot_configs|

data/lib/wal/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Wal
-  VERSION = "0.0.31"
+  VERSION = "0.0.33"
 end

data/rbi/wal.rbi

@@ -7,7 +7,7 @@ module Wal
       UpdateEvent,
       DeleteEvent,
     ) }
-  VERSION = "0.0.31"
+  VERSION = "0.0.33"
 
   class << self
     sig { returns(T.class_of(Logger)) }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: wal
 version: !ruby/object:Gem::Version
-  version: 0.0.31
+  version: 0.0.33
 platform: ruby
 authors:
 - Rodrigo Navarro
 bindir: exe
 cert_chain: []
-date: 2026-01-27 00:00:00.000000000 Z
+date: 2026-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg