herdst_worker 0.2.2 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5c514066fed024f5bd931747424c3fed9b6704948984df7f2357550aeeef1a0
-  data.tar.gz: 0675e56d2dd6f797ec59adbf45465b38989adf269a2c1087e189b2cb18b63e75
+  metadata.gz: 3254fcd594ea3a211d269c900505e43a94e009853539a8d2617199e5e6462f81
+  data.tar.gz: 6068fb649532ade81c2efa971d6b4cb047cb72c1ed3520dff2d8d8c9fdf8fd8f
 SHA512:
-  metadata.gz: 54c5faa7201d22d83289c61674b164498c431f63e954b17f4e0a5fa1cb3d8a7dd5932ba034b6fa3cc9adcaaf8f42ac457cb688c28921f8f5d0875efcb82b6c57
-  data.tar.gz: 9f17c9a4f4328b4c2a7aba995d05af9312b9f9fdce450c10035725eed6bfa71a22b5c35ac4e0630b34416be7badfc1d2ebe1b3d66fbd51000e97f1b6582f2c15
+  metadata.gz: b52253de870c4690ef7d711cbce8c76b5e9530790fc333ab2d93aeb5d563b1686498b2b9793d8fe4e58ffd99608195279c4df791c5377746c3653d84101c5837
+  data.tar.gz: 11cfac61c8bde4b86d1f93afebba9345de79c67f9d3e47309d4e129cd816c5de0dd85b3f167ec5e390a0976b0729c87b9cac17efd67b14f2305e39f526903a1c

data/lib/herdst_worker/configuration/metadata.rb

@@ -60,6 +60,24 @@ module HerdstWorker
             def get_aws_credentials
                 self.get_aws_credentials! rescue nil
             end
+
+
+            def get_tasks_info
+                metadata = make_request!(get_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 => [
+                        metadata["TaskARN"]
+                    ],
+                    :include => ["TAGS"]
+                )
+            end
             
             
             def get_aws_credentials!
@@ -103,28 +121,14 @@ module HerdstWorker
                     return self.secrets["DEPLOYMENT_ENV"] if self.secrets["DEPLOYMENT_ENV"]
                     
                     if self.is_prod?
-                        metadata = make_request!(get_metadata_uri)
-                        
-                        ecs_client = Aws::ECS::Client.new(
-                            :region => self.secrets["AWS_REGION"],
-                            :credentials => self.aws_credentials
-                        )
-                        
-                        ecs_response = ecs_client.describe_tasks(
-                            :cluster => metadata["Cluster"],
-                            :tasks => [
-                                metadata["TaskARN"]
-                            ],
-                            :include => ["TAGS"]
-                        )
-                        
-                        ecs_response["tasks"][0]["tags"].each do |i|
+                        info = self.get_tasks_info
+                        info["tasks"][0]["tags"].each do |i|
                             self[i["key"]] = i["value"]
                         end
                         
                         report_error("Deployment env not found") unless self.secrets["DEPLOYMENT_ENV"]
                         
-                        self["RELEASE_VERSION"] = ecs_response["tasks"][0]["containers"][0]["containerArn"] rescue nil
+                        self["RELEASE_VERSION"] = info["tasks"][0]["containers"][0]["containerArn"] rescue nil
                     else
                         self["DEPLOYMENT_ENV"] = "development"
                     end

data/lib/herdst_worker/queue/processor.rb

@@ -217,7 +217,7 @@ module HerdstWorker
             private
                 def reset_time
                     self.start_time = Time.now.utc.to_i
-                    self.restart_time = self.start_time + (3600 * 6)  # Six hours
+                    self.restart_time = self.start_time + (3600 * 4)  # Four hours
                 end
             
         end

data/lib/herdst_worker/version.rb

@@ -1,3 +1,3 @@
 module HerdstWorker
-  VERSION = '0.2.2'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: herdst_worker
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.4
 platform: ruby
 authors:
 - Herd.St
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-08-14 00:00:00.000000000 Z
+date: 2023-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport