inst-jobs 3.4.0 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a4ab079657570b1e9ce94abdd938367ba912afa077ccad380f38f81862fe5a43
-  data.tar.gz: a0366132ef9d5cced326cdecef3446217857e668760fae47a72f664060fc380a
+  metadata.gz: b27bc2f28f4906ac69cc6982188b528bdad5897c0bed2a6a5c6445f294eb9973
+  data.tar.gz: cddeff5c83f6ed73d63fee9ae7ffe0df2a4bc18636b11c0fd4cc80e04c8bf835
 SHA512:
-  metadata.gz: 04d51cfd152ee4a6e5145df09d1f8fec52d60c4eb74287e49d693a29f62498ca9a09655ac0dbb5ce6137817e309a7a47fb5918b737d41a2f78f64c6c8c43ff4e
-  data.tar.gz: ed4b8778c404ea2a5f57644e71b5b5bdb8be9f135056acd8eba46dcb7fec58eb39cc5bf5deb05cd4bf3e6754334d7fedb9fe5239291b276bebc1595946d97b45
+  metadata.gz: 612d7681460b68f02c11b059b09504544969123ac1f70fbb89203b69f8002a768dae8c281cd498cb610cd316ee962f58d1d8bba3b13680aff94c807931e1c68c
+  data.tar.gz: fc8126210f011236d8ca57e6a938e6e6e33c0e88f79f27cf9e612cb2bae3f743066b6527c728da3b668cf22f27c13dcc0a04764ddd02fe3c3dbc4b1ad1c2c61e

data/lib/delayed/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Delayed
-  VERSION = "3.4.0"
+  VERSION = "3.5.0"
 end

data/lib/delayed/worker/consul_health_check.rb

@@ -7,11 +7,13 @@ require "socket"
 module Delayed
   class Worker
     class ConsulHealthCheck < HealthCheck
+      include Delayed::Logging
+
       self.type_name = :consul
 
       CONSUL_CONFIG_KEYS = %w[url acl_token].map(&:freeze).freeze
       DEFAULT_SERVICE_NAME = "inst-jobs_worker"
-      attr_reader :service_client, :health_client
+      attr_reader :service_client, :health_client, :check_client
 
       def initialize(*, **)
         super
@@ -27,21 +29,23 @@ module Delayed
           end
           @service_client = Diplomat::Service.new(configuration: consul_config)
           @health_client = Diplomat::Health.new(configuration: consul_config)
+          @check_client = Diplomat::Check.new(configuration: consul_config)
         else
           @service_client = Diplomat::Service.new
           @health_client = Diplomat::Health.new
+          @check_client = Diplomat::Check.new
         end
       end
 
       def start
-        @service_client.register({
-                                   id: worker_name,
-                                   name: service_name,
-                                   check: check_attributes
-                                 })
+        registered = register
+        start_heartbeat if registered && ttl_check?
+        registered
       end
 
       def stop
+        @heartbeat_thread&.kill
+        @heartbeat_thread = nil
         @service_client.deregister(worker_name)
       end
 
@@ -56,13 +60,56 @@ module Delayed
 
       private
 
+      def register
+        @service_client.register({
+                                   id: worker_name,
+                                   name: service_name,
+                                   check: check_attributes
+                                 })
+      end
+
+      def ttl_check?
+        @config.fetch(:check_type, "script").to_s == "ttl"
+      end
+
+      def check_id
+        "service:#{worker_name}"
+      end
+
+      # in seconds
+      def ttl
+        Integer(@config.fetch(:ttl, 60))
+      end
+
+      def start_heartbeat
+        @heartbeat_thread = Thread.new do
+          loop do
+            sleep(ttl / 3.0)
+            heartbeat
+          rescue => e
+            logger.warn("Consul TTL update failed for #{worker_name}: #{e.class}: #{e.message}")
+          end
+        end
+      end
+
+      def heartbeat
+        @check_client.pass(check_id)
+      rescue Faraday::ResourceNotFound
+        logger.warn("Consul forgot #{worker_name}, re-registering")
+        register
+      end
+
       def check_attributes
-        {
-          args: ["bash", "-c", check_script],
+        base = {
           status: "passing",
-          interval: @config.fetch(:check_interval, "5m"),
           deregister_critical_service_after: @config.fetch(:deregister_service_delay, "10m")
-        }.tap do |h|
+        }
+        return base.merge(ttl: "#{ttl}s") if ttl_check?
+
+        base.merge(
+          args: ["bash", "-c", check_script],
+          interval: @config.fetch(:check_interval, "5m")
+        ).tap do |h|
           h[:docker_container_id] = docker_container_id if @config["docker"]
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inst-jobs
 version: !ruby/object:Gem::Version
-  version: 3.4.0
+  version: 3.5.0
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2026-10-19 00:00:00.000000000 Z
+date: 2026-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord