shinq 0.7.1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 792190c7626e32ef84a9df82f9a0fb6502ae936a
-  data.tar.gz: 5a9183334a17fe91af641bfc18d30f049b42edb3
+  metadata.gz: 01d64906303f1f93f1c58963b07d97b8d5f63ac7
+  data.tar.gz: 478a6b80464b1b399c19da69a8e37f4dc8dd7fbd
 SHA512:
-  metadata.gz: 57bbdaa11b9f39ce503bb1f845c74cdae2cda448ebf8a3709200e5f7bc9b4bc7d128710a23e71ef6563a82d205158085ff949f3ceacfb795adfcea6c52035673
-  data.tar.gz: '08b5390c1bc3aa2d38cfe3fafb5a9ceae784f8535a2a45bb1a6f3124ca8f1e33a57b3aa87f4250910695051a058457bbc94cd68784c22e6c79cd5174adb3d5a3'
+  metadata.gz: b165ea04629a8dd68d9e2ea480a27cdd663d69530562721cc726e8ce360a86d61188b031dde01c7da7fbd35d8a639cd2d63441f39e947563043206ff3c82a077
+  data.tar.gz: 7d8bef34453211d6e7e9bf6abc1ba19c881b7a42552dc76146d65d6e96bff947d090eeb68929e58c229a2998126fbb670a95adef3416f6e304f3aee5c5f20f5e

data/.travis.yml

@@ -6,9 +6,11 @@ rvm:
   - 2.2.0
   - 2.2.1
   - 2.2.2
+  - 2.2.7
+  - 2.3.4
+  - 2.4.1
 gemfile:
   - Gemfile
 before_install:
   - mysql -e "create database IF NOT EXISTS shinq_test;" -uroot
-  - mysql -e "use shinq_test; create table queue_test (job_id varchar(255) not null, title varchar(255), enqueued_at datetime not null);" -uroot
 script: bundle exec rspec

data/lib/shinq/cli.rb

@@ -41,6 +41,10 @@ module Shinq
           opts[:process] = v.to_i
         end
 
+        opt.on('--graceful-kill-timeout VALUE', 'Seconds to SIGQUIT workers even during performing jobs') do |v|
+          opts[:graceful_kill_timeout] = v.to_i
+        end
+
         opt.on('--queue-timeout VALUE', 'Waiting queue time(sec). use function of queue_wait(Q4M)') do |v|
           opts[:queue_timeout] = v.to_i
         end
@@ -108,6 +112,7 @@ module Shinq
         worker_type: 'process',
         pid_file: 'shinq.pid',
         workers: options.process,
+        worker_graceful_kill_timeout: options.graceful_kill_timeout
         logger: options.daemonize ? Shinq.logger : nil
       })
 

data/lib/shinq/configuration.rb

@@ -10,11 +10,12 @@ 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, :worker_class, :db_config, :queue_db, :default_db, :process, :queue_timeout, :daemonize, :statistics, :lifecycle, :abort_on_error
+    attr_accessor :require, :worker_name, :worker_class, :db_config, :queue_db, :default_db, :process, :graceful_kill_timeout, :queue_timeout, :daemonize, :statistics, :lifecycle, :abort_on_error
 
     DEFAULT = {
       require: '.',
       process: 1,
+      graceful_kill_timeout: 600,
       queue_timeout: 1,
       daemonize: false,
       abort_on_error: true

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.7.1'
+  spec.version       = '0.8.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/db/structure.sql

@@ -0,0 +1,6 @@
+DROP TABLE IF EXISTS `queue_test`;
+CREATE TABLE `queue_test` (
+  `job_id` varchar(255) NOT NULL,
+  `title` varchar(255),
+  `enqueued_at` datetime NOT NULL
+) ENGINE=QUEUE;

data/spec/integration_spec.rb

@@ -6,7 +6,10 @@ describe "Integration", skip: ENV['TRAVIS'] do
   let(:queue_table) { 'queue_test' }
 
   before do
-    load_database_config(Shinq)
+    Shinq.configuration = {
+      default_db: :test,
+      db_config: load_database_config
+    }
   end
 
   after do

data/spec/shinq/configuration_spec.rb

@@ -11,6 +11,7 @@ describe Shinq::Configuration do
     it { is_expected.to respond_to(:queue_db) }
     it { is_expected.to respond_to(:default_db) }
     it { is_expected.to respond_to(:process) }
+    it { is_expected.to respond_to(:graceful_kill_timeout) }
     it { is_expected.to respond_to(:queue_timeout) }
     it { is_expected.to respond_to(:daemonize) }
     it { is_expected.to respond_to(:statistics) }

data/spec/shinq_spec.rb

@@ -61,7 +61,10 @@ describe Shinq do
     context "when db_config is not preset" do
       let(:shinq) {
         shinq_class.tap {|s|
-          load_database_config(s)
+          s.configuration = {
+            db_config: load_database_config,
+            default_db: :test,
+          }
         }
       }
 

data/spec/spec_helper.rb

@@ -3,9 +3,13 @@ require 'simplecov'
 require 'yaml'
 require 'active_support/core_ext/hash'
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+def load_database_config
+  db_config = YAML.load_file(File.expand_path('./config/database.yml', __dir__)).symbolize_keys
+end
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(
   SimpleCov::Formatter::HTMLFormatter
-]
+)
 
 SimpleCov.start do
   add_filter 'spec'
@@ -20,14 +24,11 @@ RSpec.configure do |config|
     config.default_formatter = 'doc'
   end
 
+  config.before(:suite) do
+    connection = Mysql2::Client.new(load_database_config[:test].merge(flags: Mysql2::Client::MULTI_STATEMENTS))
+    connection.query(File.read(File.expand_path('./db/structure.sql', __dir__)))
+  end
+
   config.order = :random
   Kernel.srand config.seed
 end
-
-def load_database_config(klass)
-  db_config = YAML.load_file(File.expand_path('./config/database.yml', __dir__)).symbolize_keys
-  klass.configuration = {
-    db_config: db_config,
-    default_db: :test
-  }
-end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shinq
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.8.0
 platform: ruby
 authors:
 - Ryoichi SEKIGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2017-06-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -214,6 +214,7 @@ files:
 - lib/shinq/statistics.rb
 - shinq.gemspec
 - spec/config/database.yml
+- spec/db/structure.sql
 - spec/integration_spec.rb
 - spec/shinq/configuration_spec.rb
 - spec/shinq_spec.rb
@@ -244,6 +245,7 @@ specification_version: 4
 summary: Worker and enqueuer for Q4M using the interface of ActiveJob.
 test_files:
 - spec/config/database.yml
+- spec/db/structure.sql
 - spec/integration_spec.rb
 - spec/shinq/configuration_spec.rb
 - spec/shinq_spec.rb