belated 0.6.7 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0c28df2d6dffdff23e48d5fba469ca7a67378bebdf6538067f748ebc28d8a67
-  data.tar.gz: 1805135d97859dd9d399b3e46d636141b014e102630eefa1e7d0a9dc4a2a19bc
+  metadata.gz: e61b9cff8c5b664a99f10ce08629e22f5e5439d1f77a50c13568b0c3e90efc61
+  data.tar.gz: 84816d001fe4769645181d4baf6868cd89cf06b4812bd710e39bd5a735d04b2b
 SHA512:
-  metadata.gz: '086a0dbc146fe3386a24bef59523aeca27dcb72506e83189f39553f63e20f867f6a094faab2ce07fdaadeb0f159bd740fde9bb8bc7f6bf8b2e4f04ea551f5e2e'
-  data.tar.gz: dea44b6d05c0eda6e5cb5d58c3b317c150d1d5b4399fcac55d80c8e044faecbfd1a21d6f96394950ab271e9db2eb346057c99de4cc02df4d25e8929f25487ff3
+  metadata.gz: dc977e1a7806efc5efd79844881162f235ced10abb4f50018f6a2d29b92bf3f18b3bc4b9409e72179a336b091fa0638de7b8057aff61884c9818fff66cccf416
+  data.tar.gz: c9852a96a7c50ffc163bb0dd6891133f77f883a87cbd30bab5f3c51b512674f26dded61e50e3dfb5694b464afd5ef6b3410e12fccd95d3ba319651045b8ce3e1

data/.github/workflows/main.yml

@@ -7,7 +7,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, macos-latest]
+        os: [ubuntu-latest]
         # Due to https://github.com/actions/runner/issues/849, we have to use quotes for '3.0'
         ruby: [2.6, 2.7, '3.0']
     runs-on: ${{ matrix.os }}

data/CHANGELOG.md

@@ -1,5 +1,19 @@
 ## [Unreleased]
 
+## [0.8.2] - 2021-09-09
+- Fixed a bug where the adapter was not defined when loading jobs from the PStore file. 
+
+## [0.8.1] - 2021-09-09
+- Now you can delete jobs from the future jobs queue. This is useful if you want to delete a job that is scheduled for a future date.
+
+## [0.8] - 2021-09-08
+- Using PStore for future jobs backup and job history. Job history is rotated daily, future jobs cannot at the moment. 
+- PStore has ultrasafe mode, should test whether that makes things very slow. If not, might be worth using it for the peace of mind. Or at least have it as an option. 
+- ActiveJob support is a bit more natural now code-wise. 
+
+## [0.7] - 2021-09-04
+- ActiveJob support! Retries, exception rescuing should work as expected. 
+- Second Moderna jab took me out for a while... sorry for the long wait. 
 ## [0.6.7] - 2021-08-25
 
 - A bug fix for bad jobs bringing down client side. 

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    belated (0.6.7)
+    belated (0.8.2)
       drb
       dry-configurable
+      pstore
       ruby2_keywords
       sorted_set
 
@@ -111,6 +112,7 @@ GEM
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
+    pstore (0.1.1)
     racc (1.5.2)
     rack (2.2.3)
     rack-test (1.1.0)

data/README.md

@@ -2,11 +2,9 @@
 
 [![CodeFactor](https://www.codefactor.io/repository/github/sampokuokkanen/belated/badge)](https://www.codefactor.io/repository/github/sampokuokkanen/belated) [![Gem Version](https://badge.fury.io/rb/belated.svg)](https://badge.fury.io/rb/belated)
 
-This is Belated, a new Ruby backend job library! It supports running procs, lambdas and classes in the background. To deal with restarts, it uses YAML to load the queue into a file, which it then calls at startup to find the previous jobs. There is no way in Ruby to save procs or lambdas to a file, so they are discarded when the process restarts.
+This is Belated, a new Ruby backend job library! It supports running procs, lambdas and classes in the background. To deal with restarts, it uses YAML for the current jobs in the queue waiting to be processed and PStore for the future jobs to load the queues into a file, which it then calls at startup to find the previous jobs. There is no way in Ruby to save procs or lambdas to a file, so they are discarded when the process restarts.
 
-Belated uses the Ruby Queue class, so it's First In, First Out (FIFO). 
-
-Note that Belated used to be called HardWorker. That name was already in use in Sidekiq documentation and a bit too generic anyway. 
+Belated uses the Ruby Queue class, so it's First In, First Out (FIFO), unless of course you want to run the job in the future. In that case the order is decided by the time the job is scheduled to be executed. 
 
 It uses dRuby to do the communication! Which is absolute great. No need for Redis or PostgreSQL, just Ruby standard libraries.
 
@@ -16,15 +14,14 @@ Can be used if you're on a normal instance such as EC2 or Digital Ocean drop. No
 
 TODO LIST:
 
-- Use GDBM for queue storage? That way could maybe get rid of YAML dumping and make things a bit safer. Not ordered though, so maybe keep a list of the jobs as YAML and update it sometimes? Just as backup. Or RocksDB? Would need to be configurable if you don't have something installed.
-- Maybe support ActiveJob?
-- Have a web UI.
-- Have a job history
-- Do some performance testing.
+- Have a web UI with job history.
 - Deploy a Rails app to production that is using Belated
   and mention it in the readme. (Capistrano support?)
-  ([Wasurechatta](https://wasurechatta.com/))
-- Add a section telling people to use Sidekiq if they can
+  ([Wasurechatta](https://wasurechatta.com/) deployed, still need to setup Capistrano)
+
+# Why not Sidekiq? 
+
+If you can, definitely use Sidekiq!!! Belated is supposed to be used if you can't get anything else to work. Like if you want to use SQLite in a Rails app and don't want to have Redis running. Or maybe you just want to run procs in the background? 
 
 ## Installation
 
@@ -48,7 +45,15 @@ Start up Belated!
 
     $ belated
 
-Then, in another program, connect to Belated and give it a job to do.
+If you're using Rails, just set Belated to be the ActiveJob adapter like below:
+
+```ruby
+config.active_job.adapter = :belated
+```
+
+And you're good to go!
+
+If not, in your non-ActiveJob using program, connect to Belated and give it a job to do.
 Sample below:
 
 ```ruby
@@ -69,8 +74,21 @@ client.perform_belated(DumDum.new, at: Time.now + 5 * 60)
 client.perform_belated(DumDum.new, max_retries: 3) # default 5
 ```
 
-Belated runs on localhost, port 8788. 
-Going to make that an option in the future.
+You can also fetch jobs from the future jobs queue:
+
+```ruby
+job = client.perform_belated(proc { 0 / 0 }, at: Time.now + 5 * 60)
+job = Belated.find job.id # Find the job if it's in the future queue
+# Oh no, that job looks a bit weird!
+# Let's delete it:
+client.perform_belated(
+  Belated.delete job.id
+)
+# Yeah... currently you have to send the command through the client like this as a job. :/
+# Maybe the client should handle the deletion?
+```
+
+Belated runs on localhost, port 8788 by default, but the port is configurable, see below. 
 
 ## Rails
 

data/belated.gemspec

@@ -34,6 +34,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'drb'
   spec.add_dependency 'dry-configurable'
   spec.add_dependency 'ruby2_keywords'
+  spec.add_dependency 'pstore'
   spec.add_dependency 'sorted_set'
   spec.add_development_dependency 'byebug'
 

data/lib/active_job/queue_adapters/belated_adapter.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require 'belated'
+
+module ActiveJob # :nodoc:
+  module QueueAdapters # :nodoc:
+    # The adapter in charge of handling ActiveJob integration.
+    # WIP
+    class BelatedAdapter
+      def instance
+        @instance ||= Belated::Client.instance
+      rescue StandardError
+        @instance = Belated::Client.new
+      end
+
+      def enqueue(job) # :nodoc:
+        Rails.logger.info "Belated got job #{job}"
+        instance.perform(job, active_job: true)
+      end
+
+      def enqueue_at(job, timestamp) # :nodoc:
+        Rails.logger.info "Belated got job #{job} to be performed at #{Time.at(timestamp)}"
+        instance.perform_belated(job, at: timestamp, active_job: true)
+      end
+
+      # JobWrapper that overwrites perform for ActiveJob
+      class JobWrapper < Belated::JobWrapper
+        def perform
+          Base.execute job.serialize
+        end
+      end
+    end
+  end
+end

data/lib/belated/client.rb

@@ -74,11 +74,11 @@ class Belated
     # @param at [Date] - The time at which the job should be executed.
     # @param max_retries [Integer] - Times the job should be retried if it fails.
     # @return [JobWrapper] - The job wrapper for the queue.
-    def perform(job, at: nil, max_retries: 5)
+    def perform(job, at: nil, max_retries: 5, active_job: false)
       start unless started?
       return unless proper_job?(job)
 
-      job_wrapper = wrap_job(job, at: at, max_retries: max_retries)
+      job_wrapper = wrap_job(job, at: at.to_f, max_retries: max_retries, active_job: active_job)
       bank.push(job_wrapper)
       @mutex.synchronize do
         proc_table[job_wrapper.object_id] = job_wrapper if job_wrapper.proc_klass
@@ -98,10 +98,15 @@ class Belated
       false
     end
 
-    def wrap_job(job, at:, max_retries:)
+    def wrap_job(job, at:, max_retries:, active_job:)
       return job if job.is_a?(JobWrapper)
 
-      JobWrapper.new(job: job, at: at, max_retries: max_retries)
+      wrapper = if active_job
+                  ActiveJob::QueueAdapters::BelatedAdapter::JobWrapper
+                else
+                  JobWrapper
+                end
+      wrapper.new(job: job, at: at, max_retries: max_retries, active_job: active_job)
     end
 
     def drb_connected?

data/lib/belated/job_wrapper.rb

@@ -13,47 +13,60 @@ class Belated
   class JobWrapper
     include Comparable
     include Logging
-    attr_accessor :retries, :max_retries, :id, :job, :at, :completed, :proc_klass
+    attr_accessor :retries, :max_retries, :id, :job, :at,
+                  :completed, :proc_klass, :error, :active_job
+
+    def initialize(job:, max_retries: 5, at: nil, active_job: false)
+      raise 'JobError' unless job.respond_to?(:call) || job.respond_to?(:perform)
 
-    def initialize(job:, max_retries: 5, at: nil)
       self.retries = 0
       self.max_retries = max_retries
-      self.id = SecureRandom.uuid
+      self.id = job.respond_to?(:job_id) ? job.job_id : SecureRandom.uuid
       self.job = job
       self.at = at
-      self.completed = false
       self.proc_klass = job.instance_of?(Proc)
+      self.active_job = active_job
     end
 
     def <=>(other)
-      at <=> other.at
+      at <=> (other&.at || other&.scheduled_at)
     end
 
     # rubocop:disable Lint/RescueException
     def perform
-      resp = if job.respond_to?(:call)
-               job.call
-             else
-               job.perform
-             end
+      resp = execute
       self.completed = true
       resp
     rescue Exception => e
       case e.class
-      when Interrupt, SignalException
+      when Interrupt, SignalException, NoMethodError
         raise e
       else
-        retry_job
-        "Error while executing job, #{e.inspect}. Retry #{retries} of #{max_retries}"
+        retry_job(e)
+        "Error while executing job #{job.inspect}, #{e.inspect}. Retry #{retries} of #{max_retries}"
       end
     end
+
     # rubocop:enable Lint/RescueException
+    def execute
+      if job.respond_to?(:call)
+        job.call
+      elsif job.respond_to?(:arguments)
+        job.perform(*job.arguments)
+      else
+        job.perform
+      end
+    end
 
-    def retry_job
+    def retry_job(error)
       self.retries += 1
-      return if retries > max_retries
+      if retries > max_retries
+        self.error = error
+        return
+      end
 
-      self.at = Time.now + (retries.next**4)
+      seconds_to_retry = $TESTING ? 0.05 : retries.next**4
+      self.at = (Time.now + seconds_to_retry).to_f
       log "Job #{id} failed, retrying at #{at}"
       Belated.job_list.push(self)
     end

data/lib/belated/queue.rb

@@ -4,7 +4,7 @@ require 'belated/job'
 require 'belated/logging'
 require 'belated/job_wrapper'
 require 'sorted_set'
-
+require 'pstore'
 class Belated
   # Job queues that Belated uses.
   # queue is the jobs that are currenly
@@ -13,7 +13,7 @@ class Belated
   # to be added to queue at some point in the future.
   class Queue
     include Logging
-    attr_accessor :future_jobs
+    attr_accessor :future_jobs, :future_jobs_db
 
     FILE_NAME = 'belated_dump'
 
@@ -21,15 +21,34 @@ class Belated
       @queue = queue
       @mutex = Mutex.new
       self.future_jobs = future_jobs
+      self.future_jobs_db = PStore.new('future_jobs.pstore', true) # pass true for thread safety
+    end
+
+    def enqueue_future_jobs
+      loop do
+        job = future_jobs.min
+        if job.nil?
+          sleep Belated.heartbeat
+          next
+        end
+        if job.at <= Time.now.to_f
+          delete_job(job)
+          push(job)
+        end
+      rescue DRb::DRbConnError
+        error 'DRb connection error!!!!!!'
+        log stats
+      end
     end
 
     def push(job)
       if job.is_a?(Symbol) || job.at.nil? ||
-         job.at <= Time.now.utc
+         job.at <= Time.now.to_f
         @queue.push(job)
       else
         @mutex.synchronize do
           @future_jobs << job
+          insert_into_future_jobs_db(job) unless job.proc_klass
         end
       end
     end
@@ -52,16 +71,16 @@ class Belated
     end
 
     def load_jobs
-      log "reloading... if file exists #{File.exist?(FILE_NAME)}"
+      future_jobs_db.transaction(true) do
+        future_jobs_db.roots.each do |id|
+          future_jobs << future_jobs_db[id]
+        end
+      end
       return unless File.exist?(FILE_NAME)
 
       jobs = YAML.load(File.binread(FILE_NAME))
       jobs.each do |job|
-        if job.at && job.at > Time.now.utc
-          future_jobs.push(job)
-        else
-          @queue.push(job)
-        end
+        @queue.push(job)
       end
       File.delete(FILE_NAME)
     end
@@ -73,12 +92,6 @@ class Belated
           class_array << klass
         end
       end
-      future_jobs.each do |_job|
-        unless proc_or_shutdown?(klass = future_jobs.pop)
-          class_array << klass
-        end
-      end
-
       pp File.open(FILE_NAME, 'wb') { |f| f.write(YAML.dump(class_array)) }
     end
 
@@ -86,10 +99,32 @@ class Belated
       true
     end
 
+    def find(job_id)
+      job = nil
+      future_jobs_db.transaction(true) do
+        job = future_jobs_db[job_id]
+      end
+      job = future_jobs.find { |j| j.id == job_id } if job.nil?
+      job
+    end
+
+    def delete_job(job)
+      log "Deleting #{future_jobs.delete(job)} from future jobs"
+      future_jobs_db.transaction do
+        future_jobs_db.delete(job.id)
+      end
+    end
+
     private
 
     def proc_or_shutdown?(job)
       job.is_a?(Symbol) || job.job.instance_of?(Proc)
     end
+
+    def insert_into_future_jobs_db(job)
+      future_jobs_db.transaction do
+        future_jobs_db[job.id] = job
+      end
+    end
   end
 end

data/lib/belated/testing.rb

@@ -22,7 +22,7 @@ class Belated
   # A client that can perform jobs inline
   class Client
     alias old_perform perform
-    def perform(job, at: nil, max_retries: 5)
+    def perform(job, at: nil, max_retries: 5, active_job: false)
       if Belated::Testing.inline?
         if job.respond_to?(:call)
           job.call
@@ -30,7 +30,7 @@ class Belated
           job.perform
         end
       else
-        old_perform(job, at: at, max_retries: max_retries)
+        old_perform(job, at: at, max_retries: max_retries, active_job: active_job)
       end
     end
   end

data/lib/belated/version.rb

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

data/lib/belated/worker.rb

@@ -1,4 +1,6 @@
 require_relative 'logging'
+require 'pstore'
+
 class Belated
   # The worker class that actually gets the jobs from the queue
   # and calls them. Expects the jobs to be procs or
@@ -20,9 +22,27 @@ class Belated
 
         log "Worker #{@number} got job: #{job.inspect}"
         log job.perform
+        history_insert(job) unless job.proc_klass || !job.completed
       rescue DRb::DRbConnError, Errno::ECONNREFUSED, RangeError => e
         log e
       end
     end
+
+    private
+
+    def history_insert(job)
+      store.transaction do
+        store[job.id] = job
+      end
+    rescue StandardError => e
+      error e
+    end
+
+    def store
+      today = Time.now.strftime('%F')
+      return @store if @store&.path&.include?(today)
+
+      @store = PStore.new("history-#{today}.pstore", true)
+    end
   end
 end

data/lib/belated.rb

@@ -51,7 +51,7 @@ class Belated
     connect!
     banner_and_info
     trap_signals
-    enqueue_future_jobs
+    @@queue.enqueue_future_jobs
   end
   alias initialize start
 
@@ -65,6 +65,7 @@ class Belated
   end
 
   def trap_signals
+    pp 'trap'
     %w[INT TERM].each do |signal|
       Signal.trap(signal) do
         @worker_list.length.times do
@@ -88,29 +89,13 @@ class Belated
     require File.expand_path("#{Belated.config.rails_path}/config/environment.rb")
     require 'rails/all'
     require 'belated/rails'
+    require 'active_job/queue_adapters/belated_adapter'
   end
 
   def rails?
     Belated.config.rails
   end
 
-  def enqueue_future_jobs
-    loop do
-      job = @@queue.future_jobs.min
-      if job.nil?
-        sleep Belated.heartbeat
-        next
-      end
-      if job.at <= Time.now
-        log "Deleting #{@@queue.future_jobs.delete(job)} from future jobs"
-        @@queue.push(job)
-      end
-    rescue DRb::DRbConnError
-      error 'DRb connection error!!!!!!'
-      log stats
-    end
-  end
-
   def reload
     log 'reloading...'
     @@queue.load_jobs
@@ -156,19 +141,30 @@ class Belated
     }
   end
 
-  def self.kill_and_clear_queue!
-    @worker_list&.each do |worker|
-      Thread.kill(worker)
+  class << self
+    def find(job_id)
+      @@queue.find(job_id)
     end
-    clear_queue!
-  end
 
-  def self.clear_queue!
-    @@queue.clear
-  end
+    def delete(job_id)
+      job = find(job_id)
+      @@queue.delete_job(job)
+    end
+
+    def kill_and_clear_queue!
+      @worker_list&.each do |worker|
+        Thread.kill(worker)
+      end
+      clear_queue!
+    end
 
-  def self.fetch_job
-    @@queue.pop
+    def clear_queue!
+      @@queue.clear
+    end
+
+    def fetch_job
+      @@queue.pop
+    end
   end
 
   def job_list
@@ -179,5 +175,4 @@ class Belated
     @@queue
   end
 end
-
-require 'belated/rails' if defined?(::Rails::Engine)
+require 'active_job/queue_adapters/belated_adapter' if defined?(::Rails)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: belated
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.8.2
 platform: ruby
 authors:
 - Sampo Kuokkanen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-25 00:00:00.000000000 Z
+date: 2021-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drb
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: pstore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sorted_set
   requirement: !ruby/object:Gem::Requirement
@@ -106,6 +120,7 @@ files:
 - bin/bundle
 - bin/console
 - bin/setup
+- lib/active_job/queue_adapters/belated_adapter.rb
 - lib/belated.rb
 - lib/belated/client.rb
 - lib/belated/exceptions.rb