shinq 1.0.0.rc1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64209cd09dc412fa47ad5de740fdc48a1a4882a6
-  data.tar.gz: ac63880ed26db5f5c417d068a1a5ca6c71d76cd5
+  metadata.gz: a67651195e68cb9fb0f5ee0cb98db58a40ecdcb7
+  data.tar.gz: 14f7f91d02b1ea4e3cc4035cd30ff073058fd926
 SHA512:
-  metadata.gz: c55c274a6a76c8397cf344f10d8a1f692cea198e2c4f92474077771736f1f051f688334753da31d8f6c803b43cf43925ec6c05078bdff105e5d53503bff357a1
-  data.tar.gz: 611ff43357eeeef74737ed6d67432d706b2e0a10ad8746c224f2fddc786fe5425f8169faa4597eebebf17f663ac8de06a022b4be7b8ec32d9fa1d637f7048544
+  metadata.gz: dbd5b976361080d37a57f8fa392017624f91610ee67814cfad83e1e8fe46be779cd07b22dff8d0921a5593f95100d5f2a2dbd9f7bd666d7a19bdf9e429b05eeb
+  data.tar.gz: b18f064fee0b01b968791d31370a44fa7d95fbd95d9b1360dd0bc4e25b508b0e998553b850f298aabbc287bbfde3b1c1ea5132c448939042dabc22057f86122c

data/.travis.yml

@@ -12,5 +12,6 @@ rvm:
 gemfile:
   - Gemfile
 before_install:
+  - gem update bundler
   - mysql -e "create database IF NOT EXISTS shinq_test;" -uroot
 script: bundle exec rspec

data/lib/shinq/cli.rb

@@ -73,6 +73,10 @@ module Shinq
           opts[:abort_on_error] = v
         end
 
+        opt.on('--sleep-sec-on-error N', Integer, 'Allow worker to sleep(sec) after exception') do |v|
+          opts[:sleep_sec_on_error] = v
+        end
+
         opt.on('-v', '--version', 'Print version') do |v|
           puts "Shinq #{Shinq::VERSION}"
           exit(0)

data/lib/shinq/configuration.rb

@@ -10,7 +10,7 @@ module Shinq
   #   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, :graceful_kill_timeout, :queue_timeout, :daemonize, :statistics, :lifecycle, :abort_on_error
+    attr_accessor :require, :worker_name, :db_config, :queue_db, :default_db, :process, :graceful_kill_timeout, :queue_timeout, :daemonize, :statistics, :lifecycle, :abort_on_error, :sleep_sec_on_error
 
     DEFAULT = {
       require: '.',
@@ -18,12 +18,14 @@ module Shinq
       graceful_kill_timeout: 600,
       queue_timeout: 1,
       daemonize: false,
-      abort_on_error: true
+      abort_on_error: true,
+      sleep_sec_on_error: 1,
     }
 
     def initialize(opts)
-      %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])
+      %i(require worker_name db_config queue_db default_db process queue_timeout daemonize statistics lifecycle abort_on_error sleep_sec_on_error).each do |k|
+        value = opts.key?(k) ? opts[k] : DEFAULT[k]
+        send(:"#{k}=", value)
       end
     end
 

data/lib/shinq/launcher.rb

@@ -16,21 +16,26 @@ module Shinq
       @loop_count = 0
 
       until @stop
-        queue = Shinq::Client.dequeue(table_name: worker_name.pluralize)
-        next Shinq.logger.info("Queue is empty (#{Time.now})") unless queue
+        begin
+          queue = Shinq::Client.dequeue(table_name: worker_name.pluralize)
+          next Shinq.logger.info("Queue is empty (#{Time.now})") unless queue
 
-        if Shinq.configuration.abort_on_error
-          begin
+          if Shinq.configuration.abort_on_error
+            worker_class.new.perform(queue)
+            Shinq::Client.done
+          else
+            Shinq::Client.done
             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)
+          Shinq.clear_all_connections!
+        rescue => e
+          Shinq.logger.error(format_error_message(e))
+          sleep Shinq.configuration.sleep_sec_on_error
+
+          Shinq::Client.abort if Shinq.configuration.abort_on_error && queue
+          Shinq.clear_all_connections!
+          break
         end
 
         @loop_count += 1
@@ -50,5 +55,16 @@ module Shinq
       return false unless Shinq.configuration.lifecycle
       return (Shinq.configuration.lifecycle < @loop_count)
     end
+
+    private
+
+    def format_error_message(error)
+      if defined?(::Rails) && ::Rails.backtrace_cleaner
+        backtrace = ::Rails.backtrace_cleaner.clean(error.backtrace || []).presence || error.backtrace
+      else
+        backtrace = error.backtrace
+      end
+      "#{error.message} at #{backtrace.join('  <<<   ')}"
+    end
   end
 end

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       = '1.0.0.rc1'
+  spec.version       = '1.0.0'
   spec.authors       = ["Ryoichi SEKIGUCHI"]
   spec.email         = ["ryopeko@gmail.com"]
   spec.summary       = %q{Worker and enqueuer for Q4M using the interface of ActiveJob.}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shinq
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc1
+  version: 1.0.0
 platform: ruby
 authors:
 - Ryoichi SEKIGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-28 00:00:00.000000000 Z
+date: 2017-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -251,9 +251,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.6.8