belated 0.2.0 → 0.3.0

data/lib/belated.rb

@@ -2,11 +2,13 @@
 
 require_relative 'belated/version'
 require_relative 'belated/worker'
+require_relative 'belated/logging'
 require 'drb'
 require 'yaml'
 require 'singleton'
 require 'dry-configurable'
 require 'belated/client'
+require 'logger'
 
 # Belated is a pure Ruby job backend.
 # It has limited functionality, as it only accepts
@@ -16,8 +18,9 @@ require 'belated/client'
 # and reloads them when started again.
 class Belated
   extend Dry::Configurable
+  include Logging
   include Singleton unless $TESTING
-  URI = "druby://localhost:#{$TESTING ? Array.new(4) { rand(10) }.join : "8788"}"
+  URI = 'druby://localhost:8788'
   FILE_NAME = 'belated_dump'
   @@queue = Queue.new
 
@@ -26,6 +29,8 @@ class Belated
   setting :workers, 1
   setting :connect, true
   setting :environment, 'development'
+  setting :logger, Logger.new($stdout), reader: true
+  setting :log_level, :info, reader: true
 
   # Since it's running as a singleton, we need something to start it up.
   # Aliased for testing purposes.
@@ -39,12 +44,23 @@ class Belated
     end
     return unless Belated.config.connect
 
-    DRb.start_service(URI, @@queue, verbose: true)
-    puts banner_and_info
+    connect!
+    banner_and_info
     DRb.thread.join
   end
   alias initialize start
 
+  # Handles connection to DRb server.
+  def connect!
+    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 boot_app
     return unless rails?
 
@@ -59,6 +75,7 @@ class Belated
   end
 
   def load_jobs
+    log "reloading... if file exists #{File.exist?(Belated::FILE_NAME)}"
     return unless File.exist?(Belated::FILE_NAME)
 
     jobs = YAML.load(File.binread(FILE_NAME))
@@ -69,40 +86,26 @@ class Belated
   end
 
   def reload
+    log 'reloading...'
     load_jobs
   end
 
   def stop_workers
-    @worker_list.each do |worker|
-      Thread.kill(worker)
-    end
-    return if @@queue.empty?
-
-    class_array = []
-
-    @@queue.size.times do |_i|
-      next if (klass_or_proc = @@queue.pop).instance_of?(Proc)
-
-      class_array << klass_or_proc
-    end
-    File.open(FILE_NAME, 'wb') { |f| f.write(YAML.dump(class_array)) }
-  end
-
-  def self.stop_workers
     @worker_list&.each do |worker|
       Thread.kill(worker)
     end
     class_array = []
     @@queue.size.times do |_i|
-      next if (klass_or_proc = @@queue.pop).instance_of?(Proc)
+      next if (klass = @@queue.pop).instance_of?(Proc)
 
-      class_array << klass_or_proc
+      class_array << klass
     end
-    File.open(FILE_NAME, 'wb') { |f| f.write(YAML.dump(class_array)) }
+    pp File.open(FILE_NAME, 'wb') { |f| f.write(YAML.dump(class_array)) }
   end
 
   def banner
     <<-'BANNER'
+
     .----------------. .----------------. .----------------. .----------------. .----------------. .----------------. .----------------.
     | .--------------. | .--------------. | .--------------. | .--------------. | .--------------. | .--------------. | .--------------. |
     | |   ______     | | |  _________   | | |   _____      | | |      __      | | |  _________   | | |  _________   | | |  ________    | |
@@ -118,9 +121,9 @@ class Belated
   end
 
   def banner_and_info
-    puts banner
-    puts "Currently running Belated version #{Belated::VERSION}"
-    puts %(Belated running #{@worker_list&.length.to_i} workers on #{URI}...)
+    log banner
+    log "Currently running Belated version #{Belated::VERSION}"
+    log %(Belated running #{@worker_list&.length.to_i} workers on #{URI}...)
   end
 
   def stats
@@ -130,6 +133,13 @@ class Belated
     }
   end
 
+  def self.kill_and_clear_queue!
+    @worker_list&.each do |worker|
+      Thread.kill(worker)
+    end
+    clear_queue!
+  end
+
   def self.clear_queue!
     @@queue.clear
   end

data/lib/belated/client.rb

@@ -4,13 +4,15 @@ class Belated
 
     def initialize
       server_uri = Belated::URI
+      # @bank =
       DRb.start_service
       self.queue = DRbObject.new_with_uri(server_uri)
     end
 
-    def perform_belated(job)
+    def perform(job)
       queue.push(job)
     end
-    alias perform_later perform_belated
+    alias perform_belated perform
+    alias perform_later perform
   end
 end

data/lib/belated/logging.rb

@@ -0,0 +1,17 @@
+class Belated
+  module Logging
+    extend self
+
+    def logger
+      @logger ||= Belated.logger
+    end
+
+    def log(message)
+      logger.__send__(Belated.log_level, message)
+    end
+
+    def logger=(logger)
+      @logger = logger
+    end
+  end
+end

data/lib/belated/version.rb

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

data/lib/belated/worker.rb

@@ -1,7 +1,10 @@
+require_relative 'logging'
 class Belated
   # The worker class that actually gets the jobs from the queue
   # and calls them. Expects the jobs to be procs.
   class Worker
+    include Logging
+
     def initialize
       start_working
     end
@@ -11,19 +14,19 @@ class Belated
         job = Belated.fetch_job
         next unless job
 
-        call_job(job)
-        puts 'fetching jobs...'
+        log call_job(job)
+        log 'fetching jobs...'
       end
     end
 
     def call_job(job)
       if job.respond_to?(:call)
-        pp job.call
+        job.call
       else
-        pp job&.perform
+        job.perform
       end
     rescue StandardError => e
-      pp e.inspect
+      e.inspect
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: belated
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Sampo Kuokkanen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-25 00:00:00.000000000 Z
+date: 2021-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: drb
@@ -147,6 +147,7 @@ files:
 - hard_worker_dump
 - lib/belated.rb
 - lib/belated/client.rb
+- lib/belated/logging.rb
 - lib/belated/rails.rb
 - lib/belated/version.rb
 - lib/belated/worker.rb