herdst_worker 0.2.15 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fcd03953e649cd8b334ecdc2ce8886adc7d96296eafef0039a9c8054cc4348b7
-  data.tar.gz: f15295725ead0ec27ac81618c61638e6e8daaa88f666c58ae24aa85112e4508d
+  metadata.gz: 38eaf100a0f45339a420402ba0dd782cf4daa2338fe6f362c65a35dade5f3be9
+  data.tar.gz: d07205a7ea5857f3fe4b1906526cc87043bbe28668613bd1c7e472f08480251e
 SHA512:
-  metadata.gz: 4180fe9da7ad0b299db0b2b0afa35898b8c0e09f8c6cccaac247e6caf6f0e1dd964465702c09c30be52eb55ebbc843c2fd5b4e526694284e38530199c33fed4e
-  data.tar.gz: 62a6d442d0db01e9aeb871157465ff38412dd5f540607d78fc0ee517842af63da3561e952495d337750d7976f935322d45326a2d84ca6f6cf15ece938ccbebee
+  metadata.gz: 44cfd9d0daca7cf3baf25f38f556c2fa3b1590edc111dfff3b1ab65b1db7aac02e62448f9afea1b7da97d0c41bc5ad7fa4c64fe8c7aa5135dccf98345e5f9199
+  data.tar.gz: e1d21d8ab1e447768bc2453b724594c71e27daedff5d11333b658bc7d19c4db58b2f0b8f872b967e41d1cac68dbefb5bbd56fa0493441ca9a4a4fb27344affe8

data/lib/herdst_worker/application/facade.rb

@@ -1,3 +1,5 @@
+require "concurrent-ruby"
+
 require_relative '../configuration/facade'
 require_relative '../log/facade'
 require_relative '../autoload/facade'
@@ -64,6 +66,13 @@ module HerdstWorker
                 self.queue.start
             end
         end
+
+
+        def stop(exit_code = 0)
+            self.logger.warn "Application exiting (#{exit_code})"
+
+            Kernel.exit(exit_code)
+        end
         
         
         def config_for(name)

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
+            attr_accessor :start_time, :restart_time, :run_time
             attr_accessor :processor_status, :job_count, :max_jobs
             attr_accessor :attempt_threshold, :visibility_timeout, :ignored_notifications
             
@@ -29,6 +29,7 @@ module HerdstWorker
                 ]
                 
                 # Set the start time 
+                self.run_time = (3600 * 4) + (rand * 600).floor # Four hours + bit more (< 10 minutes)
                 self.reset_time
                 
                 # Start the processor as working
@@ -47,6 +48,10 @@ 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
                 else
                     raise "Cannot start a queue which is not enabled"
                 end
@@ -116,30 +121,32 @@ module HerdstWorker
                 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 "Stopping after #{runtime} seconds of work"
+                    self.app.logger.queue.warn "Preparing to stop after #{runtime} seconds of work"
                     set_status "stopping"
                 
-                # On finishing wait for jobs to complete and then set status
-                # to idle
+                # On finishing wait for jobs to complete and then set status to idle
                 elsif self.processor_status == "finishing"
                     if self.job_count == 0
                         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
                 # to stopped. Once stopped the polling will terminate.
-                elsif self.processor_status == "stopping"
+                if self.processor_status == "stopping"
                     if self.job_count == 0
                         self.app.logger.queue.warn "Setting processor status to stopped"
                         set_status "stopped"
                     end
-                
                 end
                 
+                # Once stopped exit the application
                 if self.processor_status == "stopped"
-                    self.app.logger.queue.warn "Exiting program, Service requested to stop"
-                    exit(0)
+                    self.app.logger.queue.warn "Stopping polling, Service requested to stop"
+
+                    throw :stop_polling
                 end
             end
             
@@ -221,7 +228,7 @@ module HerdstWorker
             private
                 def reset_time
                     self.start_time = Time.now.utc.to_i
-                    self.restart_time = self.start_time + (3600 * 4)  # Four hours
+                    self.restart_time = self.start_time + self.run_time
                 end
             
         end

data/lib/herdst_worker/version.rb

@@ -1,3 +1,3 @@
 module HerdstWorker
-  VERSION = '0.2.15'
+  VERSION = '0.2.17'
 end

metadata

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