herdst_worker 0.2.18 → 0.2.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cb8f2fe78959dcc72ddb5262d5f775f7e2c8894e4cea3079df5574bc9afa469
-  data.tar.gz: 26a30f925cd508910027e86449fc2ed0832dd64232c94f1992b0743a6f108046
+  metadata.gz: 3ce5fcef880ba98bfb395902e833adb341b994af3ad88075578e63e00ee44323
+  data.tar.gz: b7a9f4fc95c34e96fbcc07efb82ef57ad67744fd645dfe95866685c7ab0ec478
 SHA512:
-  metadata.gz: 72a91bfab0fd4e3c19a6c98eb5c1cbca69c0d07950165145ec15d9c877593f8a497d7c21b931d4ad356141edafe0908556612da24e574352289d38f6fcc9449c
-  data.tar.gz: 013a1ef632e3f4fb751399e86fb2004bef44bd84d3fcc17a22a11919f4ba986c2428ee8c48ed38e5c4de7d9fd427de9bc7cd29276e2c487fd69aa02469c3360b
+  metadata.gz: 73f8e2525c067e07115e0e67b4d55937983a185d98fb682c70f9b3ff7738ee0821602c38c7c786d1ef9b03b3696bb30cd2c234fe5fb8fe0cc8f1ead6fec2b233
+  data.tar.gz: 3a084a98cd4d0da4cd8bd2e2116585512f358d0fdd8787528e3ebd38a632e8defa240475554d1169c56c8dd5b6800c6f2e578173b41e81d69d969b9bbef19bba

data/bin/herdst_worker_health

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby
+
+tmp_path = Dir.pwd + "/tmp"
+process_id = File.new(tmp_path + "/process_id").read rescue nil
+process_status = File.new(tmp_path + "/process_status").read rescue nil
+unhealthy = process_id == nil || ["stopped"].include?(process_status)
+
+Kernel.exit(unhealthy ? 1 : 0)

data/lib/herdst_worker/application/facade.rb

@@ -1,4 +1,5 @@
 require "concurrent-ruby"
+require "aws-sdk-ecs"
 
 require_relative '../configuration/facade'
 require_relative '../log/facade'
@@ -73,12 +74,14 @@ module HerdstWorker
 
             Kernel.exit(exit_code)
         end
-        
 
-        def force_stop(delay = 1)
-            self.logger.warn "Application force stopping in #{delay} seconds."
+
+        def force_stop(delay = nil)
+            delay = 600 if delay == nil # 10 minutes
             process_id = "#{$$}"
-            
+
+            self.logger.warn "Application force stopping in #{delay} seconds."
+
             Concurrent::ScheduledTask.execute(delay) do
                 self.logger.warn "Application force stopping."
 
@@ -86,7 +89,51 @@ module HerdstWorker
             end
         end
 
-        
+
+        def register_new_task
+            # info = self.config.metadata.get_service_config
+            # credentials = self.config.metadata.get_aws_credentials!
+            # ecs_client = Aws::ECS::Client.new(
+            #     :region => info[:region],
+            #     :credentials => credentials
+            # )
+
+            # resp = ecs_client.update_service({
+            #     :cluster => info[:cluster],
+            #     :service => info[:service_name],
+
+            #     # :task_definition => "amazon-ecs-sample", 
+
+            #     :desired_count => desired_count, 
+            # })
+
+            # puts "info"
+            # puts info.inspect
+        end
+
+
+        def deregister_task
+            begin
+                info = self.config.metadata.get_service_config
+                credentials = self.config.metadata.get_aws_credentials!
+                ecs_client = Aws::ECS::Client.new(
+                    :region => info[:region],
+                    :credentials => credentials
+                )
+
+                ecs_client.stop_task({
+                    cluster: info[:cluster],
+                    reason: "Task expired.", 
+                    task: info[:task_id]
+                })
+
+            rescue Exception => ex
+                self.stop
+
+            end
+        end
+
+
         def config_for(name)
             self.config.config_for(name)
         end

data/lib/herdst_worker/configuration/metadata.rb

@@ -85,13 +85,13 @@ module HerdstWorker
 
 
             def get_tasks_info
-                metadata = make_request!(get_task_metadata_uri)
+                metadata = make_request!(self.get_task_metadata_uri)
 
                 ecs_client = Aws::ECS::Client.new(
                     :region => self.secrets["AWS_REGION"],
                     :credentials => self.aws_credentials
                 )
-                
+
                 ecs_client.describe_tasks(
                     :cluster => metadata["Cluster"],
                     :tasks => [
@@ -120,6 +120,20 @@ module HerdstWorker
             end
             
             
+            def get_service_config
+                metadata = make_request!(self.get_task_metadata_uri_v4)
+
+                {
+                    :task_id => metadata["TaskARN"].split("/").last,
+                    :task_arn => metadata["TaskARN"],
+                    :cluster => metadata["Cluster"].split("/").last, 
+                    :service_name => metadata["ServiceName"], 
+                    :region => self.secrets["AWS_REGION"],
+                    :task_definition => metadata["Family"] + ":" + metadata["Revision"]
+                }
+            end
+
+            
             def get_aws_credentials!
                 credentials = self.is_prod? ? 
                      make_request!(get_credentials_uri) :
@@ -230,6 +244,10 @@ module HerdstWorker
                 def get_task_metadata_uri
                     ENV["ECS_CONTAINER_METADATA_URI"].to_s + "/task"
                 end
+
+                def get_task_metadata_uri_v4
+                    ENV["ECS_CONTAINER_METADATA_URI_V4"].to_s + "/task"
+                end
                 
                 def get_credentials_uri
                     "http://169.254.170.2" + ENV["AWS_CONTAINER_CREDENTIALS_RELATIVE_URI"].to_s

data/lib/herdst_worker/queue/processor.rb

@@ -9,7 +9,7 @@ module HerdstWorker
             
             
             attr_accessor :app, :enabled, :queue_url, :queue_wait_time, :poller
-            attr_accessor :start_time, :restart_time, :run_time, :force_stop_delay
+            attr_accessor :start_time, :stop_processing_at, :stop_at, :run_duration, :stop_suration
             attr_accessor :processor_status, :job_count, :max_jobs
             attr_accessor :attempt_threshold, :visibility_timeout, :ignored_notifications
             
@@ -29,8 +29,8 @@ module HerdstWorker
                 ]
                 
                 # Set the start time 
-                self.run_time = (3600 * 4) + (rand * 600).floor # Four hours + bit more (< 10 minutes)
-                self.force_stop_delay = 600 # 10 minutes
+                self.run_duration = (3600 * 4) + (rand * 900).floor # Four hours + bit more (< 15 minutes)
+                self.stop_suration = 300 # 5 minutes
                 self.reset_time
                 
                 # Start the processor as working
@@ -49,10 +49,8 @@ module HerdstWorker
                     self.poller.poll(:wait_time_seconds => self.queue_wait_time, :skip_delete => false) do |msg|
                         process_message(msg)
                     end
-                    
-                    if self.processor_status == "stopped"
-                        self.app.stop(0)
-                    end
+
+                    self.app.deregister_task
                 else
                     raise "Cannot start a queue which is not enabled"
                 end
@@ -77,7 +75,7 @@ module HerdstWorker
             # Sets the processor status to finishing. The sqs before action will 
             # take care of setting the idle state once all jobs have finished.
             def halt
-                return if self.processor_status === "finishing"
+                return if self.processor_status == "finishing"
                 set_status "finishing"
             end
             
@@ -120,12 +118,15 @@ module HerdstWorker
                 # After hours of running terminate application. 
                 # The app will automatically restart in production
                 current_time = Time.now.utc.to_i
-                if (self.processor_status == "working") && (current_time >= self.restart_time)
-                    runtime = current_time - self.start_time
-                    self.app.logger.queue.warn "Preparing to stop after #{runtime} seconds of work"
-                    self.app.force_stop(self.force_stop_delay)
-                    
-                    set_status "stopping"                
+
+                if (self.processor_status == "stopping") && (current_time >= self.stop_at)
+                    self.app.deregister_task
+
+                elsif (self.processor_status == "working") && (current_time >= self.stop_processing_at)
+                    self.app.force_stop(900)
+                    self.app.register_new_task
+
+                    set_status "stopping"
 
                 # On finishing wait for jobs to complete and then set status to idle
                 elsif self.processor_status == "finishing"
@@ -133,7 +134,7 @@ module HerdstWorker
                         self.app.logger.queue.warn "Setting processor status to idle"
                         set_status "idle"
                     end
-                
+                    
                 end
 
                 # On stopping wait for jobs to complete and then set status
@@ -222,7 +223,7 @@ module HerdstWorker
                         self.job_count -= 1
                     }.execute
                 else
-                    self.poller.change_message_visibility_timeout(msg, self.visibility_timeout * 2)
+                    self.poller.change_message_visibility_timeout(msg, 5)
                     throw :skip_delete
                 end
             end
@@ -231,7 +232,8 @@ module HerdstWorker
             private
                 def reset_time
                     self.start_time = Time.now.utc.to_i
-                    self.restart_time = self.start_time + self.run_time
+                    self.stop_processing_at = self.start_time + self.run_duration
+                    self.stop_at = self.stop_processing_at + self.stop_suration
                 end
             
         end

data/lib/herdst_worker/version.rb

@@ -1,3 +1,3 @@
 module HerdstWorker
-  VERSION = '0.2.18'
+  VERSION = '0.2.20'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herdst_worker
 version: !ruby/object:Gem::Version
-  version: 0.2.18
+  version: 0.2.20
 platform: ruby
 authors:
 - Herd.St
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2026-01-26 00:00:00.000000000 Z
+date: 2026-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -240,6 +240,7 @@ email:
 executables:
 - herdst_worker
 - herdst_worker_console
+- herdst_worker_health
 extensions: []
 extra_rdoc_files: []
 files:
@@ -247,6 +248,7 @@ files:
 - ReadMe.md
 - bin/herdst_worker
 - bin/herdst_worker_console
+- bin/herdst_worker_health
 - lib/herdst_worker.rb
 - lib/herdst_worker/adapters/database.rb
 - lib/herdst_worker/adapters/facade.rb