belated 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99491dbba348e9e991f00436b70faa69d7ee3646961172014499a09276e9cb1e
-  data.tar.gz: ebb40194db4cf9893edb0b06f6b940a4076e5ec328ea00ba2ab40bd839ebe7e6
+  metadata.gz: 995560f345bb7644aa19035b27a68d43a1210ee36c21d13e21cc430b76d9fded
+  data.tar.gz: 103441a7e60e79319c65bacbedfb4dc337224c41c0e9560225f3b2421e219473
 SHA512:
-  metadata.gz: 0b40900814f6cae2396025fd6ebda46b6fedc11ae7bca92ffcd534cdd6a782e0cca581a264c6f0b3bac05c1c925de8d32590270370445dab62a8c50f9749df90
-  data.tar.gz: 397925608f6083f3722e69661e7731d9f56557ee44d8b79e811b655a7d25dd2f58755f607ad00137296607dd6f1f3fe88045237152134769bb4b5b09aea5cb73
+  metadata.gz: ecc27c208d2fdb26c93ee39ebba7ada11236e9f564565d69258dfa6381a407c924e076365329f088ca4071955fd0eaeb8e9e1a1119f77d824473987590fee670
+  data.tar.gz: 57db27785351cbba33b6c704f877eacf4343d95a02267411e79bf63f1efadb49a67430342d145898a8571318bc61eafdd756bc2618388603122a0733bad7a3ed

data/.gitignore

@@ -12,4 +12,5 @@
 .byebug_history
 /dummy/tmp/cache/
 /dummy/log/
-belated_dump
+/dummy/log/test.log
+belated_dump

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 
 
+## [0.3.2] - 2021-07-31
+
+- Trap INT and TERM, so now the shutdown is a little bit more graceful. 
+
 ## [0.3.1] - 2021-07-29
 
 - Remove dummy app from gem... size should go down quite a bit. 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    belated (0.3.1)
+    belated (0.3.2)
       drb
       dry-configurable
 

data/README.md

@@ -10,19 +10,23 @@ It uses dRuby to do the communication! Which is absolute great. No need for Redi
 
 TODO LIST:
 
-- ~~Marshal the job queue into a file so you don't lose all progress~~
-  (Ended up using YAML)
 - Catch SIGTERM and friends
-- ~~Support Rails~~ (Supported!)
-- ~~Parse options from command line, eg. `--workers 10`~~(Done!)
+  - Now supports it, partly. 
 - Don't crash on errors (Partially done)
-- ~~Add a logger~~
 - Make it possible to schedule jobs
 - Maybe support ActiveJob?
 - Have a web UI
 - Do some performance testing
 - Add a section telling people to use Sidekiq if they can
 
+DONE
+
+- ~~Marshal the job queue into a file so you don't lose all progress~~
+  (Ended up using YAML)
+- ~~Add a logger~~
+- ~~Support Rails~~ (Supported!)
+- ~~Parse options from command line, eg. `--workers 10`~~(Done!)
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/lib/belated.rb

@@ -36,8 +36,7 @@ class Belated
   # Aliased for testing purposes.
   # This is only run from the bin file.
   def start
-    boot_app
-    load_jobs
+    boot_app && load_jobs
     @worker_list = []
     Belated.config.workers.times do |_i|
       @worker_list << Thread.new { Worker.new }
@@ -46,6 +45,7 @@ class Belated
 
     connect!
     banner_and_info
+    trap_signals
     DRb.thread.join
   end
   alias initialize start
@@ -55,12 +55,22 @@ class Belated
     DRb.start_service(URI, @@queue, verbose: true)
   rescue DRb::DRbConnError, Errno::EADDRINUSE
     Belated.logger.error 'Could not connect to DRb server.'
-    uri = "druby://localhost:#{Array.new(4) { rand(10) }.join}"
-    self.class.send(:remove_const, 'URI')
-    self.class.const_set('URI', uri)
     retry
   end
 
+  def trap_signals
+    %w[INT TERM].each do |signal|
+      Signal.trap(signal) do
+        @worker_list.length.times do
+          @@queue.push(:shutdown)
+        end
+        Thread.new { stop_workers }
+        sleep 0.1 until @@queue.empty?
+        exit
+      end
+    end
+  end
+
   def boot_app
     return unless rails?
 
@@ -92,6 +102,7 @@ class Belated
 
   def stop_workers
     @worker_list&.each do |worker|
+      sleep 0.1 if worker.alive?
       Thread.kill(worker)
     end
     class_array = []

data/lib/belated/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class Belated
-  VERSION = '0.3.1'
+  VERSION = '0.3.2'
 end

data/lib/belated/worker.rb

@@ -11,8 +11,9 @@ class Belated
 
     def start_working
       loop do
-        job = Belated.fetch_job
-        next unless job
+        next unless (job = Belated.fetch_job)
+
+        break if job == :shutdown
 
         log call_job(job)
         log 'fetching jobs...'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: belated
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Sampo Kuokkanen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-29 00:00:00.000000000 Z
+date: 2021-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drb
@@ -78,7 +78,6 @@ files:
 - bin/bundle
 - bin/console
 - bin/setup
-- hard_worker_dump
 - lib/belated.rb
 - lib/belated/client.rb
 - lib/belated/logging.rb

data/hard_worker_dump

@@ -1 +0,0 @@
---- []