belated 0.5.1 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5824acbe80af6b8b64a09ab2a0ee62d204504f99edee65d426ab05c737d52da0
-  data.tar.gz: ed3ff585ac66e715e55afd143bcf63fa534bd3434c9f6e9b5d4e0960fa47d9c8
+  metadata.gz: 94a7f0ce2c6f7c80dfe5b8410c72dac95dbc709937361b36aa7eaeea091d8cfb
+  data.tar.gz: da41ab683e0a2729b1dc1e7228592e91a0d259cc46bbaf6ef4a2186abb379330
 SHA512:
-  metadata.gz: 7d42b2530bd69a3a523383d98ccceb7ef76406bcf4c20791d93231b31004a6c43a208781308ede75fb614c84281bac3a97394646df9f0225a09de244030ff485
-  data.tar.gz: 62a9d873677daba7273ba182c2c0470f9ef9188d8a370d35fa94a7a45676abdbb4a26898299b886e06496f5bab85e9f740276e62f9dd9ee507f8ceb891605080
+  metadata.gz: cacbed28173905bf3fd5489bb8797abecfe4402096cea5d068dcec5a3bf27d9d5c1d048c7d9cc159aedef9cda981a038f4177d6ccd3648c87752d2bedb94390d
+  data.tar.gz: f92f505a4d8a53c13b4411ae611d5584377f09b31f8e33f9f39a1daf77b3684b977e3c01a472a654c4c07251a1e0aba6fc2f9953eb7383ef1c15fd7be2385e33

data/.rubocop.yml

@@ -1,3 +1,4 @@
+require: rubocop-performance
 AllCops:
   TargetRubyVersion: 2.7
   NewCops: enable
@@ -22,9 +23,6 @@ Style/AsciiComments:
 Style/ClassVars:
   Enabled: false
 
-Style/Documentation:
-  Enabled: false
-
 Style/GlobalVars:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,5 +1,21 @@
 ## [Unreleased]
 
+## [0.5.5] - 2021-08-15
+
+- Use SortedSet for future jobs, to avoid having to go through the whole list every few seconds. 
+
+
+## [0.5.4] - 2021-08-13
+
+- Client was using 100% CPU when it had no connection. (on $5 Digital Ocean droplet) Should be fixed now. 
+
+## [0.5.3] - 2021-08-13
+
+- A bit less looping - better performance.
+## [0.5.2] - 2021-08-13
+
+- An error with shutdown handling was fixed.
+
 ## [0.5.1] - 2021-08-12
 
 - Requiring byebug in bin file. 😮

data/Gemfile

@@ -9,10 +9,10 @@ gem 'rake', '~> 13.0'
 
 gem 'rspec', '~> 3.0'
 
-gem 'rubocop', '~> 1.7'
-
 gem 'database_cleaner-active_record'
 gem 'rails', '>= 6.1.3'
 gem 'rspec-rails'
+gem 'rubocop', '~> 1.7'
+gem 'rubocop-performance', require: false
 gem 'sqlite3'
 gem 'stackprof'

data/Gemfile.lock

@@ -1,9 +1,10 @@
 PATH
   remote: .
   specs:
-    belated (0.5.1)
+    belated (0.5.5)
       drb
       dry-configurable
+      sorted_set
 
 GEM
   remote: https://rubygems.org/
@@ -135,6 +136,7 @@ GEM
       thor (~> 1.0)
     rainbow (3.0.0)
     rake (13.0.6)
+    rbtree (0.4.4)
     regexp_parser (2.1.1)
     rexml (3.2.5)
     rspec (3.10.0)
@@ -169,7 +171,14 @@ GEM
       unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.7.0)
       parser (>= 3.0.1.1)
+    rubocop-performance (1.11.4)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
     ruby-progressbar (1.11.0)
+    set (1.0.1)
+    sorted_set (1.0.3)
+      rbtree
+      set (~> 1.0)
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
@@ -200,8 +209,9 @@ DEPENDENCIES
   rspec (~> 3.0)
   rspec-rails
   rubocop (~> 1.7)
+  rubocop-performance
   sqlite3
   stackprof
 
 BUNDLED WITH
-   2.2.17
+   2.2.22

data/README.md

@@ -16,8 +16,10 @@ Can be used with or without Rails.
 
 TODO LIST:
 
+- Use GDBM for queeue storage? That way could maybe get rid of YAML dumping and make things a bit safer. 
+- Rescue `DRb::DRbRemoteError` when shutting down, might not need to if using GDBM?
 - Don't use class instance variables.
-- Make port configurable.
+- Make DRb port configurable.
 - Don't hardcode timezone.
 - Add some checks to the client for proper jobs.
 - Have multiple queues?
@@ -27,6 +29,7 @@ TODO LIST:
 - Do some performance testing.
 - Deploy a Rails app to production that is using Belated
   and mention it in the readme. (Capistrano support?)
+  ([Wasurechatta](wasurechatta.com))
 - Add a section telling people to use Sidekiq if they can
 
 ## Installation
@@ -136,9 +139,15 @@ After checking out the repo, run `bin/setup` to install dependencies. Then, run
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and the created tag, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+
+# Possible problems
+
+If you have the port 8788 already in use, you can check the ports in use in Linux with the following command:
+
+    $ sudo lsof -i -P -n | grep LISTEN
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/sampokuokkanen/belated. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/sampokuokkanen/belated/blob/master/CODE_OF_CONDUCT.md).
+Bug reports, questions and pull requests are welcome on GitHub at https://github.com/sampokuokkanen/belated. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/sampokuokkanen/belated/blob/master/CODE_OF_CONDUCT.md).
 
 ## License
 

data/belated.gemspec

@@ -33,6 +33,7 @@ Gem::Specification.new do |spec|
   # Uncomment to register a new dependency of your gem
   spec.add_dependency 'drb'
   spec.add_dependency 'dry-configurable'
+  spec.add_dependency 'sorted_set'
   spec.add_development_dependency 'byebug'
 
   # For more information and examples about making a new gem, checkout our

data/lib/belated.rb

@@ -91,13 +91,17 @@ class Belated
   def enqueue_future_jobs
     log 'starting future jobs thread'
     loop do
-      @@queue.future_jobs.each_with_index do |job, i|
-        if job.at <= Time.now.utc
-          log "Deleting #{@@queue.future_jobs.delete_at(i)} from future jobs"
-          @@queue.push(job)
-        end
+      sleep 0.1
+      job = @@queue.future_jobs.at(0)
+      if job.nil?
+        sleep 5
+        next
+      end
+
+      if job.at <= Time.now.utc
+        log "Deleting #{@@queue.future_jobs.delete(job)} from future jobs"
+        @@queue.push(job)
       end
-      sleep 0.01
     end
   end
 

data/lib/belated/client.rb

@@ -26,6 +26,12 @@ class Belated
     def start_banker_thread
       self.banker_thread = Thread.new do
         loop do
+          sleep 0.01
+          unless drb_connected?
+            sleep(10)
+            next
+          end
+
           job = bank.pop
 
           perform(job)
@@ -50,9 +56,16 @@ class Belated
     rescue DRb::DRbConnError
       bank.push(job_wrapper)
       start_banker_thread if banker_thread.nil?
-      banker_thread.wakeup if banker_thread.status == 'sleep'
     end
     alias perform_belated perform
     alias perform_later perform
+
+    private
+
+    def drb_connected?
+      queue.connected?
+    rescue StandardError
+      false
+    end
   end
 end

data/lib/belated/job_wrapper.rb

@@ -3,6 +3,7 @@ require_relative 'logging'
 
 class Belated
   class JobWrapper
+    include Comparable
     include Logging
     attr_accessor :retries, :max_retries, :id, :job, :at
 
@@ -14,6 +15,10 @@ class Belated
       self.at = at
     end
 
+    def <=>(another)
+      at <=> another.at
+    end
+
     # rubocop:disable Lint/RescueException
     def perform
       if job.respond_to?(:call)

data/lib/belated/queue.rb

@@ -3,6 +3,8 @@
 require 'belated/job'
 require 'belated/logging'
 require 'belated/job_wrapper'
+require 'sorted_set'
+
 class Belated
   class Queue
     include Logging
@@ -10,13 +12,14 @@ class Belated
 
     FILE_NAME = 'belated_dump'
 
-    def initialize(queue: Thread::Queue.new, future_jobs: [])
+    def initialize(queue: Thread::Queue.new, future_jobs: SortedSet.new)
       @queue = queue
       self.future_jobs = future_jobs
     end
 
     def push(job)
-      if job.at.nil? || job.at <= Time.now.utc
+      if job.is_a?(Symbol) || job.at.nil? ||
+         job.at <= Time.now.utc
         @queue.push(job)
       else
         @future_jobs << job
@@ -71,10 +74,14 @@ class Belated
       pp File.open(FILE_NAME, 'wb') { |f| f.write(YAML.dump(class_array)) }
     end
 
+    def connected?
+      true
+    end
+
     private
 
     def proc_or_shutdown?(job)
-      job.job.instance_of?(Proc) || job == :shutdown
+      job.job.instance_of?(Proc) || job.is_a?(Symbol)
     end
   end
 end

data/lib/belated/version.rb

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

data/lib/belated/worker.rb

@@ -16,7 +16,7 @@ class Belated
         log "Worker #{@number} fetching jobs!"
         next unless (job = Belated.fetch_job)
 
-        break if job == :shutdown
+        break if job.is_a?(Symbol)
 
         log "Worker #{@number} got job: #{job.inspect}"
         job.perform

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: belated
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.5
 platform: ruby
 authors:
 - Sampo Kuokkanen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-08-12 00:00:00.000000000 Z
+date: 2021-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drb
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sorted_set
+  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: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +123,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Run background jobs with Belated and dRuby!