shinq 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 775e97f7be5e8a0af51289776fb5f80452272fab
-  data.tar.gz: cff7b9411652a96f51b09e8728196053d8e495c7
+  metadata.gz: 655d145ff88397bca387abccd196c36888428e21
+  data.tar.gz: 41df3f27cc6b3af3fa50a5fa2d3d0ab0da24293d
 SHA512:
-  metadata.gz: 9e647a7d1a3e1ae6650e2b41e202fa78f7342592a630ac47c5e2bb7f58dceb809b74a5c1d5cdfbd448af25135f1ea652a0de81416c7c3fe75d54518683f8c935
-  data.tar.gz: d40da827e5b1a620a245dd9764a459eb9603641c539054d837a8d08fa1ff5d09f6f417643dc94cb66f0a0fde47848b93502fba07d2499938cf5bf438befd9e6c
+  metadata.gz: 10c3396b0201a6d678c8be2fb172c885e58ef13a14c56ffc7f5c4af37f95e9af579c60bda6a3236112bf3b95fd98d27ac4b07f88fc2250736a7b964113aa77c8
+  data.tar.gz: 6307bd0ce80f84e26b4e9cbfd11f2e463ba9f933bffa3149d9f275117bb5103ebf9174a7d632d6f83445516f10699ed91e2eef20accaefb2882e0df9e117e667

data/lib/shinq/cli.rb

@@ -63,6 +63,10 @@ module Shinq
           opts[:statistics] = v.to_i
         end
 
+        opt.on('--[no-]abort-on-error', 'Abort ') do |v|
+          opts[:abort_on_error] = v
+        end
+
         opt.on('-v', '--version', 'Print version') do |v|
           puts "Shinq #{Shinq::VERSION}"
           exit(0)

data/lib/shinq/configuration.rb

@@ -1,18 +1,27 @@
 module Shinq
   class ConfigurationError < StandardError; end
 
+  # @!attribute abort_on_error
+  #   @return [Boolean] Whether do +queue_abort()+ on performing failure.
+  #   @see Shinq::Launcher#run
+  #
+  #   Defaults to +true+, which means that worker do +queue_end()+ AFTER it proceeds a job.
+  #   If it is +false+, worker do +queue_end()+ BEFORE it proceeds a job.
+  #   You may need to set it +false+ for jobs which take very long time to proceed.
+  #   You may also need to handle performing error manually then.
   class Configuration
-    attr_accessor :require, :worker_name, :db_config, :queue_db, :default_db, :process, :queue_timeout, :daemonize, :statistics, :lifecycle
+    attr_accessor :require, :worker_name, :db_config, :queue_db, :default_db, :process, :queue_timeout, :daemonize, :statistics, :lifecycle, :abort_on_error
 
     DEFAULT = {
       require: '.',
       process: 1,
       queue_timeout: 1,
-      daemonize: false
+      daemonize: false,
+      abort_on_error: true
     }
 
     def initialize(opts)
-      %i(require worker_name db_config queue_db default_db process queue_timeout daemonize statistics lifecycle).each do |k|
+      %i(require worker_name db_config queue_db default_db process queue_timeout daemonize statistics lifecycle abort_on_error).each do |k|
         send(:"#{k}=", opts[k] || DEFAULT[k])
       end
     end

data/lib/shinq/launcher.rb

@@ -3,6 +3,8 @@ require 'active_support/inflector'
 
 module Shinq
   module Launcher
+    # Wait configured queue and proceed each of them until stop.
+    # @see Shinq::Configuration#abort_on_error
     def run
       worker_name = Shinq.configuration.worker_name
       worker_class = worker_name.camelize.constantize
@@ -13,15 +15,20 @@ module Shinq
         queue = Shinq::Client.dequeue(table_name: worker_name.pluralize)
         next Shinq.logger.info("Queue is empty (#{Time.now})") unless queue
 
-        begin
+        if Shinq.configuration.abort_on_error
+          begin
+            worker_class.new.perform(queue)
+          rescue => e
+            Shinq::Client.abort
+            raise e
+          end
+
+          Shinq::Client.done
+        else
+          Shinq::Client.done
           worker_class.new.perform(queue)
-        rescue => e
-          Shinq::Client.abort
-          raise e
         end
 
-        Shinq::Client.done
-
         @loop_count += 1
 
         if lifecycle_limit?

data/shinq.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |spec|
   spec.name          = "shinq"
-  spec.version       = '0.6.0'
+  spec.version       = '0.7.0'
   spec.authors       = ["Ryoichi SEKIGUCHI"]
   spec.email         = ["ryopeko@gmail.com"]
   spec.summary       = %q{Worker and enqueuer for Q4M using the interface of ActiveJob.}

data/spec/shinq/configuration_spec.rb

@@ -15,6 +15,7 @@ describe Shinq::Configuration do
     it { is_expected.to respond_to(:daemonize) }
     it { is_expected.to respond_to(:statistics) }
     it { is_expected.to respond_to(:lifecycle) }
+    it { is_expected.to respond_to(:abort_on_error) }
   end
 
   describe ".new" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shinq
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Ryoichi SEKIGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2017-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler