pgbus 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1e18f777c6b6f2dbc0f927994e19587a489f0551be9f5e228c4d47b3f346fa0
-  data.tar.gz: 433faca464a6f881a21cbcf950c3238cdd34e1e11fac0108a320dd98e23dfae1
+  metadata.gz: e06c29b37491ad78b26d4799f11baea645e4380b2ebb6950bec74ad7be339f13
+  data.tar.gz: 712a67117a92021b45ab361476068c9885b03a8215ff02d8327e58f6b9a5abd2
 SHA512:
-  metadata.gz: 89418720dfb7433c1716cff8e238e74fee2be4c04a8023a4c2dc3b67fdf393b9ddb9f7c4df70b435a6cdcc9a3668c1c24e78bedce83c0c22d93d196ab1ee1574
-  data.tar.gz: b10d5f71b80c97e42573b2b034c0c1b4444342d6e729fef0fd0e8a97dba269eb35cdca8fc4bfcb4446dd17e630683859c1b5d0043467218baf15b72b05fb3e38
+  metadata.gz: f3e083cd40e0a1d02577c015283d83e3aeb8a1205bde8bb21e5e4c5e6df8b70f031f894fb1bfc93771caaeb4d26b5e1c7cca08cfa01dfad0d31a2b946db997f4
+  data.tar.gz: fe1d70f3a39bb849981a025b5d9fee6e2c447a0fc641ce771e606e42f2da8892a40e7cb68ecaa57aac47fe970c819cdd0c60f8c439d92fe1306662da309f1dfd

data/lib/pgbus/client.rb

@@ -33,13 +33,12 @@ module Pgbus
       @pgmq_mutex = Mutex.new
       @queues_created = Concurrent::Map.new
       @queue_strategy = QueueFactory.for(config)
+      @schema_ensured = false
     end
 
     def ensure_queue(name)
+      ensure_pgmq_schema
       @queue_strategy.physical_queue_names(name).each { |pq| ensure_single_queue(pq) }
-    rescue PGMQ::Errors::ConnectionError => e
-      raise Pgbus::SchemaNotReady,
-            "PGMQ schema is not available (#{e.message}). Run `rails db:migrate` for the pgbus database."
     end
 
     def ensure_all_queues
@@ -201,7 +200,9 @@ module Pgbus
 
       loop do
         deleted = synchronized do
-          @pgmq.pool.with { |conn| conn.exec_params(sql, [older_than, batch_size]).cmd_tuples }
+          with_raw_connection do |conn|
+            conn.exec_params(sql, [older_than, batch_size]).cmd_tuples
+          end
         end
         total += deleted
         break if deleted < batch_size
@@ -254,6 +255,66 @@ module Pgbus
       queues.to_a
     end
 
+    def ensure_pgmq_schema
+      return if @schema_ensured
+
+      synchronized do
+        return if @schema_ensured
+
+        with_raw_connection do |raw_conn|
+          exists = raw_conn.exec("SELECT 1 FROM pg_tables WHERE schemaname = 'pgmq' AND tablename = 'meta' LIMIT 1")
+          install_pgmq_schema(raw_conn) if exists.ntuples.zero?
+        end
+        @schema_ensured = true
+      end
+    rescue StandardError => e
+      raise Pgbus::SchemaNotReady,
+            "PGMQ schema installation failed (#{e.class}: #{e.message}). " \
+            "Ensure the pgbus database exists and migrations have been run."
+    end
+
+    def install_pgmq_schema(conn)
+      mode = config.pgmq_schema_mode
+
+      case mode
+      when :extension
+        Pgbus.logger.info { "[Pgbus] PGMQ schema not found — installing via extension" }
+        conn.exec("CREATE EXTENSION IF NOT EXISTS pgmq")
+      when :embedded
+        Pgbus.logger.info { "[Pgbus] PGMQ schema not found — installing embedded SQL" }
+        conn.exec(PgmqSchema.install_sql)
+      else # :auto
+        ext = conn.exec("SELECT 1 FROM pg_available_extensions WHERE name = 'pgmq' LIMIT 1")
+        if ext.ntuples.positive?
+          Pgbus.logger.info { "[Pgbus] PGMQ schema not found — installing via extension" }
+          conn.exec("CREATE EXTENSION IF NOT EXISTS pgmq")
+        else
+          Pgbus.logger.info { "[Pgbus] PGMQ schema not found — installing embedded SQL" }
+          conn.exec(PgmqSchema.install_sql)
+        end
+      end
+    end
+
+    def with_raw_connection
+      opts = config.connection_options
+      owned = false
+      conn = case opts
+             when Proc
+               opts.call
+             when String
+               owned = true
+               PG.connect(opts)
+             when Hash
+               owned = true
+               PG.connect(**opts)
+             else
+               raise ConfigurationError, "Cannot resolve raw PG connection from #{opts.class}"
+             end
+      yield conn
+    ensure
+      conn&.close if owned
+    end
+
     def ensure_single_queue(full_name)
       return if @queues_created[full_name]
 

data/lib/pgbus/recurring/scheduler.rb

@@ -17,6 +17,7 @@ module Pgbus
       def run
         setup_signals
         start_heartbeat
+        sync_recurring_tasks
 
         Pgbus.logger.info do
           "[Pgbus] Scheduler started: #{schedule.tasks.size} recurring tasks, " \
@@ -84,6 +85,16 @@ module Pgbus
 
       private
 
+      def sync_recurring_tasks
+        tasks = config.recurring_tasks
+        return if tasks.nil?
+
+        RecurringTask.sync_from_config!(tasks)
+        Pgbus.logger.info { "[Pgbus] Synced #{tasks.size} recurring task(s) from configuration" }
+      rescue StandardError => e
+        Pgbus.logger.error { "[Pgbus] Failed to sync recurring tasks: #{e.class}: #{e.message}" }
+      end
+
       def start_heartbeat
         @heartbeat = Process::Heartbeat.new(
           kind: "scheduler",

data/lib/pgbus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Pgbus
-  VERSION = "0.1.9"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pgbus
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Mikael Henriksson