fleiss 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45bf4b9f2a7a9d88cbdd4feb8fb2992d6545554695c791a1f327a5a26da3e53d
-  data.tar.gz: 4434eac634c36952365be272f5f8327462577db2cc338c97b1f242f2f59d14bf
+  metadata.gz: b76bfb38938511dcf5053855e5a9091ad694c0b1c1fafba3e551b5757aaa1dfe
+  data.tar.gz: 9ff274eeba83d0e5ffc878c4934a4c03bbc91ede2bd2eb0f7e6c026fdd3dc1bb
 SHA512:
-  metadata.gz: d008669212582e7e5190ee0901024555c5031d0295b934d08dd91508d0b83251ea7790540c0e4d8339cae15b6aa9c6c043d5fc39eaa18bc5a696a30e23bc4a0f
-  data.tar.gz: fc3f5555a6290abebd712e545172fea30eb4be0074da2eb86bc1cb136216af563054111d45599f2e9ddb3560a94c00256e7a8d00b3f7b69e849d39264911131d
+  metadata.gz: b145758e74ac991211a2677409fe31a185a094ee3304d54d2cf41937446c257dba225a01183591743486e3d91725e37ffbec747c01f3a144652693645e08d5f6
+  data.tar.gz: 55909e4fbf2652fe613767eca254d585ac89e07ff8d2e40c5b6e502e266a8fda6dd4f02b32c4dc1cf880cfc33f83e8433fed30e255978531bb2f3ef621bd2a83

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fleiss (0.1.3)
+    fleiss (0.2.0)
       activejob (>= 5.0)
       activerecord (>= 5.0)
       concurrent-ruby
@@ -25,11 +25,11 @@ GEM
       tzinfo (~> 1.1)
     arel (9.0.0)
     ast (2.4.0)
-    concurrent-ruby (1.1.3)
+    concurrent-ruby (1.1.4)
     diff-lcs (1.3)
     globalid (0.4.1)
       activesupport (>= 4.2.0)
-    i18n (1.2.0)
+    i18n (1.3.0)
       concurrent-ruby (~> 1.0)
     jaro_winkler (1.5.1)
     minitest (5.11.3)
@@ -83,4 +83,4 @@ DEPENDENCIES
   sqlite3
 
 BUNDLED WITH
-   1.16.4
+   1.17.2

data/bin/fleiss

@@ -5,6 +5,9 @@ $LOAD_PATH.push(lib_dir) unless $LOAD_PATH.include?(lib_dir)
 
 require 'fleiss/cli'
 
+STDOUT.sync = true
+STDERR.sync = true
+
 cli = Fleiss::CLI.instance
 begin
   cli.parse!

data/fleiss.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'fleiss'
-  s.version       = '0.1.3'
+  s.version       = '0.2.0'
   s.authors       = ['Black Square Media Ltd']
   s.email         = ['info@blacksquaremedia.com']
   s.summary       = %(Minimialist background jobs backed by ActiveJob and ActiveRecord.)

data/lib/fleiss/cli.rb

@@ -2,7 +2,6 @@ require 'singleton'
 require 'optparse'
 require 'yaml'
 require 'erb'
-require 'logger'
 
 module Fleiss
   class CLI
@@ -15,7 +14,6 @@ module Fleiss
       require: [],
       concurrency: 10,
       wait_time: 1.0,
-      logfile: STDOUT,
     }.freeze
 
     attr_reader :opts
@@ -46,14 +44,11 @@ module Fleiss
       opts[:require].each {|n| require n }
       require 'fleiss/worker'
 
-      logdev = opts[:logfile]
-      logdev.sync = true if logdev.respond_to?(:sync=)
-
+      ActiveJob::Base.logger = ActiveSupport::TaggedLogging.new(ActiveSupport::Logger.new(opts[:logfile])) if opts[:logfile]
       Fleiss::Worker.run \
         queues: opts[:queues],
         concurrency: opts[:concurrency],
-        wait_time: opts[:wait_time],
-        logger: Logger.new(logdev)
+        wait_time: opts[:wait_time]
     end
 
     def parser # rubocop:disable Metrics/MethodLength

data/lib/fleiss/worker.rb

@@ -1,11 +1,10 @@
 require 'fleiss'
 require 'concurrent/executor/fixed_thread_pool'
 require 'concurrent/atomic/atomic_fixnum'
-require 'logger'
 require 'securerandom'
 
 class Fleiss::Worker
-  attr_reader :queues, :uuid, :wait_time, :logger
+  attr_reader :queues, :uuid, :wait_time
 
   # Shortcut for new(*args).run
   def self.run(*args)
@@ -18,24 +17,22 @@ class Fleiss::Worker
   # @option [Array<String>] :queues queues to watch. Default: ["default"]
   # @option [Integer] :concurrency the number of concurrent pool. Default: 10
   # @option [Numeric] :wait_time maximum time (in seconds) to wait for jobs when retrieving next batch. Default: 1s.
-  # @option [Logger] :logger optional logger.
-  def initialize(queues: [Fleiss::DEFAULT_QUEUE], concurrency: 10, wait_time: 1, logger: nil)
+  def initialize(queues: [Fleiss::DEFAULT_QUEUE], concurrency: 10, wait_time: 1)
     @uuid      = SecureRandom.uuid
     @queues    = Array(queues)
     @pool      = Concurrent::FixedThreadPool.new(concurrency, fallback_policy: :discard)
     @wait_time = wait_time
-    @logger    = logger || Logger.new(nil)
   end
 
   # Run starts the worker
   def run
-    logger.info "Worker #{uuid} starting - queues: #{queues.inspect}, concurrency: #{@pool.max_length}"
+    log(:info) { "Worker #{uuid} starting - queues: #{queues.inspect}, concurrency: #{@pool.max_length}" }
     loop do
       run_cycle
       sleep @wait_time
     end
   rescue SignalException => e
-    logger.info "Worker #{uuid} received #{e.message}. Shutting down..."
+    log(:info) { "Worker #{uuid} received #{e.message}. Shutting down..." }
   ensure
     @pool.shutdown
     @pool.wait_for_termination
@@ -43,6 +40,15 @@ class Fleiss::Worker
 
   private
 
+  def log(severity, &block)
+    logger = ActiveJob::Base.logger
+    if logger.respond_to?(:tagged)
+      logger.tagged('Fleiss') { logger.send(severity, &block) }
+    else
+      logger.send(severity, &block)
+    end
+  end
+
   def run_cycle
     return if @pool.shuttingdown?
 
@@ -67,7 +73,7 @@ class Fleiss::Worker
     owner     = "#{uuid}/#{thread_id}"
     return unless job.start(owner)
 
-    logger.info { "Worker #{uuid} execute job ##{job.id} (by thread #{thread_id})" }
+    log(:info) { "Worker #{uuid} execute job ##{job.id} (by thread #{thread_id})" }
     finished = false
     begin
       ActiveJob::Base.execute job.job_data
@@ -83,12 +89,12 @@ class Fleiss::Worker
   end
 
   def handle_exception(err, intro)
-    lines = [
-      "Worker #{uuid} error on #{intro}:",
-      "#{err.class.name}: #{err.message}",
-      err.backtrace,
-    ].compact.flatten
-
-    logger.error lines.join("\n")
+    log(:error) do
+      [
+        "Worker #{uuid} error on #{intro}:",
+        "#{err.class.name}: #{err.message}",
+        err.backtrace,
+      ].compact.flatten.join("\n")
+    end
   end
 end

data/lib/fleiss.rb

@@ -1,3 +1,7 @@
+require 'active_job'
+require 'active_job/queue_adapters/fleiss_adapter'
+require 'fleiss/backend'
+
 module Fleiss
   DEFAULT_QUEUE = 'default'.freeze
 
@@ -5,5 +9,3 @@ module Fleiss
     self::Backend::ActiveRecord
   end
 end
-
-require 'fleiss/backend'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fleiss
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Black Square Media Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-12-19 00:00:00.000000000 Z
+date: 2018-12-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activejob