belated 0.6.6 → 0.6.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 628f04309c824751bd90f72163d29738f5600f7ed5b759b0106d09b9eccbf23e
-  data.tar.gz: 1318b353fb2047ae6e185f0af720a987a3d8c784a483df04a79601fb595ff28f
+  metadata.gz: e0c28df2d6dffdff23e48d5fba469ca7a67378bebdf6538067f748ebc28d8a67
+  data.tar.gz: 1805135d97859dd9d399b3e46d636141b014e102630eefa1e7d0a9dc4a2a19bc
 SHA512:
-  metadata.gz: de9793daf6f3987be47b798916dbdfa16e7be92211f46395ed4d63eabf7ae127420952c047df749de584404cd18e80a002f5fadb40896421583e80f3ebe9bf2a
-  data.tar.gz: 3a09388e73a833d3230787f6191cd02a86cc4ebf3e58ba950d8631eba31a67fe4cf319bfaa448bc471b5fe1a933d9564c7d846d3416d91832a7b5331c78e62b9
+  metadata.gz: '086a0dbc146fe3386a24bef59523aeca27dcb72506e83189f39553f63e20f867f6a094faab2ce07fdaadeb0f159bd740fde9bb8bc7f6bf8b2e4f04ea551f5e2e'
+  data.tar.gz: dea44b6d05c0eda6e5cb5d58c3b317c150d1d5b4399fcac55d80c8e044faecbfd1a21d6f96394950ab271e9db2eb346057c99de4cc02df4d25e8929f25487ff3

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## [Unreleased]
 
+## [0.6.7] - 2021-08-25
+
+- A bug fix for bad jobs bringing down client side. 
+- Heartbeat option for server side. It only affects jobs in the wait list, it's used to determine how often to check the future jobs queue. 
 ## [0.6.6] - 2021-08-25
 
 - Tests now run agains Ruby 2.6, so relaxing the version constraint. 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    belated (0.6.6)
+    belated (0.6.7)
       drb
       dry-configurable
       ruby2_keywords

data/lib/belated/client.rb

@@ -76,7 +76,8 @@ class Belated
     # @return [JobWrapper] - The job wrapper for the queue.
     def perform(job, at: nil, max_retries: 5)
       start unless started?
-      check_if_proper_job!(job)
+      return unless proper_job?(job)
+
       job_wrapper = wrap_job(job, at: at, max_retries: max_retries)
       bank.push(job_wrapper)
       @mutex.synchronize do
@@ -90,10 +91,11 @@ class Belated
 
     private
 
-    def check_if_proper_job!(job)
-      return if job.respond_to?(:call) || job.respond_to?(:perform)
+    def proper_job?(job)
+      return true if job.respond_to?(:call) || job.respond_to?(:perform)
 
-      raise JobError, 'job does not implement .call nor .perform!'
+      warn 'job does not implement .call nor .perform!'
+      false
     end
 
     def wrap_job(job, at:, max_retries:)

data/lib/belated/queue.rb

@@ -19,6 +19,7 @@ class Belated
 
     def initialize(queue: Thread::Queue.new, future_jobs: SortedSet.new)
       @queue = queue
+      @mutex = Mutex.new
       self.future_jobs = future_jobs
     end
 
@@ -27,7 +28,9 @@ class Belated
          job.at <= Time.now.utc
         @queue.push(job)
       else
-        @future_jobs << job
+        @mutex.synchronize do
+          @future_jobs << job
+        end
       end
     end
 

data/lib/belated/version.rb

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

data/lib/belated.rb

@@ -33,6 +33,7 @@ class Belated
   setting :log_level, :info, reader: true
   setting :host, 'localhost', reader: true
   setting :port, '8788', reader: true
+  setting :heartbeat, 1, reader: true
   setting :client_heartbeat, 5, reader: true
   URI = "druby://#{Belated.host}:#{Belated.port}"
 
@@ -56,8 +57,10 @@ class Belated
 
   # Handles connection to DRb server.
   def connect!
+    i = 0
     DRb.start_service(URI, @@queue, verbose: true)
   rescue DRb::DRbConnError, Errno::EADDRINUSE
+    sleep 0.1 and retry if (i += 1) < 5
     error 'Could not connect to DRb server.'
   end
 
@@ -93,10 +96,9 @@ class Belated
 
   def enqueue_future_jobs
     loop do
-      sleep 0.1
       job = @@queue.future_jobs.min
       if job.nil?
-        sleep 5
+        sleep Belated.heartbeat
         next
       end
       if job.at <= Time.now

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: belated
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Sampo Kuokkanen