good_job 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66c19e40862f09e5c7816911c0a21e8cb88f036980a9c33df62cba058b3993e5
-  data.tar.gz: 218153476e92ca847e7279d9979c4396ed02f36a41918b32b58bf1fb17b8cd92
+  metadata.gz: a808beca38372ee8dcd23871600c9ed9b0181aa7756656c46e0382e9eef927b0
+  data.tar.gz: 7fa59a1e31b4e720149ed19009f91691e840096570d38e519d37eb9b930cb655
 SHA512:
-  metadata.gz: d5b0305c889392d2879ccd818eb98b09a867d85a5b853dc8ec35b5a17fee3490cc082f032827f631b15e0a8e1143ea676eea05738d901f97ec4737adf0a514d0
-  data.tar.gz: 96a8537b85de48b07f676746642bb43ff18369db559b0c058c21d101a7740a0269a772a3b8629fefe3242d2e8a1df0d34a0f12b85b5928caf6272572fcff0d67
+  metadata.gz: 9ce51a00e0aeabbd2be39e796168343d0daf96b368cb75ae8011f05bec891fcab820323189c43c79b97ae5a4c2586a7ec4996cd68717a83bb66613b7db523a95
+  data.tar.gz: d0cb6bc52ba43a1e86a4ba12a8a09204d90f3b393de0d0dc54de64de37c85290f8228362e76f8c023a0d78f28d63706b4c8f2b04626134bc4240d9ad055544db

data/CHANGELOG.md

@@ -1,8 +1,17 @@
 # Changelog
 
-## [Unreleased](https://github.com/bensheldon/good_job/tree/HEAD)
+## [0.2.2](https://github.com/bensheldon/good_job/tree/0.2.2) (2020-03-07)
 
-[Full Changelog](https://github.com/bensheldon/good_job/compare/v0.2.0...HEAD)
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v0.2.1...0.2.2)
+
+**Merged pull requests:**
+
+- Gracefully shutdown Scheduler when executable receives TERM or INT [\#17](https://github.com/bensheldon/good_job/pull/17) ([bensheldon](https://github.com/bensheldon))
+- Update Appraisals [\#16](https://github.com/bensheldon/good_job/pull/16) ([bensheldon](https://github.com/bensheldon))
+
+## [v0.2.1](https://github.com/bensheldon/good_job/tree/v0.2.1) (2020-03-07)
+
+[Full Changelog](https://github.com/bensheldon/good_job/compare/v0.2.0...v0.2.1)
 
 **Merged pull requests:**
 

data/lib/good_job/cli.rb

@@ -8,11 +8,23 @@ module GoodJob
     def start
       require RAILS_ENVIRONMENT_RB
 
-      GoodJob::Scheduler.new
+      scheduler = GoodJob::Scheduler.new
+
+      %w[INT TERM].each do |signal|
+        trap(signal) { @stop_good_job_executable = true }
+      end
+      @stop_good_job_executable = false
+
+      $stdout.puts "GoodJob waiting for jobs..."
 
       Kernel.loop do
-        sleep 1
+        sleep 0.1
+        break if @stop_good_job_executable || scheduler.shutdown?
       end
+
+      $stdout.puts "\nFinishing GoodJob's current jobs before exiting..."
+      scheduler.shutdown
+      $stdout.puts "GoodJob's jobs finished, exiting..."
     end
 
     default_task :start

data/lib/good_job/logging.rb

@@ -42,6 +42,18 @@ module GoodJob
         end
       end
 
+      def scheduler_start_shutdown(_event)
+        info do
+          "Shutting down scheduler..."
+        end
+      end
+
+      def scheduler_shutdown(_event)
+        info do
+          "Scheduler is shut down."
+        end
+      end
+
       private
 
       def logger

data/lib/good_job/scheduler.rb

@@ -42,17 +42,24 @@ module GoodJob
     end
 
     def shutdown(wait: true)
-      if @timer.running?
-        @timer.shutdown
-        @timer.wait_for_termination if wait
-      end
+      @_shutdown = true
+
+      ActiveSupport::Notifications.instrument("scheduler_start_shutdown.good_job", { wait: wait })
+      ActiveSupport::Notifications.instrument("scheduler_shutdown.good_job", { wait: wait }) do
+        if @timer.running?
+          @timer.shutdown
+          @timer.wait_for_termination if wait
+        end
 
-      if @pool.running?
-        @pool.shutdown
-        @pool.wait_for_termination if wait
+        if @pool.running?
+          @pool.shutdown
+          @pool.wait_for_termination if wait
+        end
       end
+    end
 
-      true
+    def shutdown?
+      @_shutdown
     end
 
     def create_thread

data/lib/good_job/version.rb

@@ -1,3 +1,3 @@
 module GoodJob
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: good_job
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ben Sheldon
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-07 00:00:00.000000000 Z
+date: 2020-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby