herdst_worker 0.2.16 → 0.2.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3bcca0fea942c15752e9a0c7f56f1b0d9a333d9fbe0fcef1cd4b722a0333f72
-  data.tar.gz: b9868c69103c6b4947b66fe801775c824a848ba0d4cb9ee8284b01593e593996
+  metadata.gz: 38eaf100a0f45339a420402ba0dd782cf4daa2338fe6f362c65a35dade5f3be9
+  data.tar.gz: d07205a7ea5857f3fe4b1906526cc87043bbe28668613bd1c7e472f08480251e
 SHA512:
-  metadata.gz: e891b196b8418014c671b15fe48498ad7785820ea9dc99c3d1b1ca2a5ab693b822cd006f017b1c6221e747ca4b08eec163be7bc00644327024d3972509ca5302
-  data.tar.gz: 055ead61ea81ac0025d3e539ae69633031b3fd09b288476eb5f82d6be2eeca504c4d9af8ac81c1d6a51dd5bd01c717f35475844a1ca7d14f567fb10c99049136
+  metadata.gz: 44cfd9d0daca7cf3baf25f38f556c2fa3b1590edc111dfff3b1ab65b1db7aac02e62448f9afea1b7da97d0c41bc5ad7fa4c64fe8c7aa5135dccf98345e5f9199
+  data.tar.gz: e1d21d8ab1e447768bc2453b724594c71e27daedff5d11333b658bc7d19c4db58b2f0b8f872b967e41d1cac68dbefb5bbd56fa0493441ca9a4a4fb27344affe8

data/lib/herdst_worker/application/facade.rb

@@ -69,11 +69,9 @@ module HerdstWorker
 
 
         def stop(exit_code = 0)
-            Concurrent::ScheduledTask.execute(5) do
-                self.logger.queue.warn "Application exiting (#{exit_code})"
+            self.logger.warn "Application exiting (#{exit_code})"
 
-                exit(exit_code)
-            end
+            Kernel.exit(exit_code)
         end
         
         

data/lib/herdst_worker/queue/processor.rb

@@ -48,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
@@ -117,32 +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 "Stopping polling, Service requested to stop"
-                    self.app.stop(1)
-                    
-                    raise :stop_polling
+
+                    throw :stop_polling
                 end
             end
             

data/lib/herdst_worker/version.rb

@@ -1,3 +1,3 @@
 module HerdstWorker
-  VERSION = '0.2.16'
+  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.16
+  version: 0.2.17
 platform: ruby
 authors:
 - Herd.St