herdst_worker 0.2.20 → 0.2.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce5fcef880ba98bfb395902e833adb341b994af3ad88075578e63e00ee44323
-  data.tar.gz: b7a9f4fc95c34e96fbcc07efb82ef57ad67744fd645dfe95866685c7ab0ec478
+  metadata.gz: 9fa8ccaf7c0b1ea579be583057020ce2499ad6d7fd1ea806f526c81d0a3adfe3
+  data.tar.gz: 1c4af6793b81b741e308cad5db603fce45bd81dfb408ece724a4091c1c910471
 SHA512:
-  metadata.gz: 73f8e2525c067e07115e0e67b4d55937983a185d98fb682c70f9b3ff7738ee0821602c38c7c786d1ef9b03b3696bb30cd2c234fe5fb8fe0cc8f1ead6fec2b233
-  data.tar.gz: 3a084a98cd4d0da4cd8bd2e2116585512f358d0fdd8787528e3ebd38a632e8defa240475554d1169c56c8dd5b6800c6f2e578173b41e81d69d969b9bbef19bba
+  metadata.gz: 7bf2ce6ce4e78f2f8b409c63d390774028e0296afd81dde6664ba962f60089a8ea275d850adfbffd5970145eb499225d4a377df229c250761db40aa592521e24
+  data.tar.gz: 42c9f0b24900bef7ede09b10d0200cafa878f24dbd7d8506c4ea69f11555496b1c70bf6b67da800c1c2cc88c5409d5b8a1818e965cb05891fb4bf50b451acecb

data/bin/herdst_worker_health

@@ -1,8 +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
+process_id = File.new(tmp_path + "/process_id").read.strip rescue nil
+process_status = File.new(tmp_path + "/process_status").read.strip rescue nil
 unhealthy = process_id == nil || ["stopped"].include?(process_status)
 
 Kernel.exit(unhealthy ? 1 : 0)

data/lib/herdst_worker/application/facade.rb

@@ -91,24 +91,7 @@ module HerdstWorker
 
 
         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
 
 

data/lib/herdst_worker/queue/processor.rb

@@ -181,50 +181,51 @@ module HerdstWorker
                         self.job_count -= 1
                         
                     }.rescue { |ex|
-                        if will_fail_permanently
-                            self.app.logger.queue.error "Message failed #{attempt_number} times, Reporting and failing permanently. \n#{ex.to_s} \n#{ex.backtrace.join("\n")}"
-                            Sentry.capture_exception(ex, {
-                                :level => "fatal",
-                                :extra => {
-                                    "queue_attempts" => attempt_number,
-                                    "queue_message_body" => msg.body
-                                }
-                            })
-
-                        else
-                            self.app.logger.queue.error "Message failed #{attempt_number} times, Adding back to queue."
-                            
-                            if self.app.config.is_dev?
-                                puts ex.inspect
-                                puts ex.backtrace
-                            end
-                            
-                            replaced_message = {
-                                :queue_url => self.poller.queue_url,
-                                :message_body => msg.body,
-                                :delay_seconds => self.visibility_timeout,
-                                :message_attributes => msg_attrs.merge({
-                                    "attempts" => {
-                                        :string_value => attempt_number.to_s,
-                                        :data_type => "Number"
+                        begin
+                            if will_fail_permanently
+                                self.app.logger.queue.error "Message failed #{attempt_number} times, Reporting and failing permanently. \n#{ex.to_s} \n#{ex.backtrace.join("\n")}"
+                                Sentry.capture_exception(ex, {
+                                    :level => "fatal",
+                                    :extra => {
+                                        "queue_attempts" => attempt_number,
+                                        "queue_message_body" => msg.body
                                     }
                                 })
-                            }
+
+                            else
+                                self.app.logger.queue.error "Message failed #{attempt_number} times, Adding back to queue."
+                                
+                                self.poller.client.send_message({
+                                    :queue_url => self.poller.queue_url,
+                                    :message_body => msg.body,
+                                    :delay_seconds => self.visibility_timeout,
+                                    :message_attributes => msg_attrs.merge({
+                                        "attempts" => {
+                                            :string_value => attempt_number.to_s,
+                                            :data_type => "Number"
+                                        }
+                                    })
+                                })
+                            end
                             
-                            self.poller.client.send_message replaced_message
-                        end
-                        
-                        if self.app.config.is_dev?
-                            self.app.logger.queue.error "Processor Error:"
-                            self.app.logger.queue.error ex.message
-                            self.app.logger.queue.error ex.backtrace
+                            if self.app.config.is_dev?
+                                self.app.logger.queue.error "Processor Error:"
+                                self.app.logger.queue.error ex.message
+                                self.app.logger.queue.error ex.backtrace
+                            end
+
+                        rescue Exception => inner_ex
+                            self.app.logger.queue.error inner_ex.message
+
+                        ensure
+                            self.job_count -= 1
+
                         end
-                        
-                        self.job_count -= 1
                     }.execute
                 else
                     self.poller.change_message_visibility_timeout(msg, 5)
                     throw :skip_delete
+
                 end
             end
             

data/lib/herdst_worker/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: herdst_worker
 version: !ruby/object:Gem::Version
-  version: 0.2.20
+  version: 0.2.21
 platform: ruby
 authors:
 - Herd.St