shinq 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 27fb65cd784140db7180182ee23747354ea16316
-  data.tar.gz: d3b16bae80c1e983ddff5a417caa23ae28f1ad0b
+  metadata.gz: 1c2780c72c0818659e65f0cf005dcd19d78cb3cb
+  data.tar.gz: 48fc9366fb03e2efc32df1d865e9358a920db6ff
 SHA512:
-  metadata.gz: d9636a00d1c4d5c9a57fa5a3bdf697bb0814fb3c3caa3f61f4dc775473fb967b0c4f81980609025aaf4d475553bee80d03e6d872f3b428724938aa3f2acc7280
-  data.tar.gz: 36076bca1dfb6cb3c6d89f18dada6116a22b0b8123ad3e1987980cc030c0d21eec495e0326590ceb6695779d7b32e5c2ece588aa4dc5b5dc98a3bef8fcf82230
+  metadata.gz: 51fc1856fd6ced06b6f54c483cd6235dd9d095cb9de3359c278f1776ec0c0d7dd106b2fa1acd8c0a9ee095b941dfb35fdb5675459a2122823265a3d6e3420139
+  data.tar.gz: d8b4bc498f2db51975cde120f6e8ae5815fce0365c86bad579dbb6ccf342d4f30ad8760fc431649cafb59f71b606db7c827530c7d0f284db1d39768bc64e4c6e

data/lib/shinq/cli.rb

@@ -2,6 +2,7 @@ require 'optparse'
 require 'yaml'
 require 'shinq'
 require 'shinq/launcher'
+require 'shinq/statistics'
 require 'shinq/configuration'
 require 'serverengine'
 
@@ -27,11 +28,11 @@ module Shinq
           opts[:daemonize] = v
         end
 
-        opt.on('--worker value', 'Name of worker class') do |v|
+        opt.on('-w', '--worker value', 'Name of worker class') do |v|
           opts[:worker_name] = v
         end
 
-        opt.on('--process VALUE', 'Number of workers') do |v|
+        opt.on('-p', '--process VALUE', 'Number of workers') do |v|
           opts[:process] = v.to_i
         end
 
@@ -39,7 +40,7 @@ module Shinq
           opts[:queue_timeout] = v.to_i
         end
 
-        opt.on('--db-config VALUE', 'Specify configuration file') do |v|
+        opt.on('--db-config VALUE', 'Specify database configuration file') do |v|
           raise OptionParseError, "#{v} does not exist" unless File.exist?(v)
           opts[:db_config] = YAML.load_file(v)
         end
@@ -49,10 +50,14 @@ module Shinq
           opts[:queue_db] = v
         end
 
-        opt.on('--require VALUE', 'Add require path') do |v|
+        opt.on('-r', '--require VALUE', 'Add require path') do |v|
           opts[:require] = v
         end
 
+        opt.on('-s', '--statistics VALUE', 'Display queue statistics interval time(sec)') do |v|
+          opts[:statistics] = v.to_i
+        end
+
         opt.on('-v', '--version', 'Print version') do |v|
           puts "Shinq #{Shinq::VERSION}"
           exit(0)
@@ -82,7 +87,9 @@ module Shinq
     end
 
     def run
-      se = ServerEngine.create(nil, Shinq::Launcher, {
+      klass = !options.statistics.nil? && options.statistics ? Shinq::Statistics : Shinq::Launcher
+
+      se = ServerEngine.create(nil, klass, {
         daemonize: options.daemonize,
         worker_type: 'process',
         pid_file: 'shinq.pid',

data/lib/shinq/configuration.rb

@@ -2,7 +2,7 @@ module Shinq
   class ConfigurationError < StandardError; end
 
   class Configuration
-    attr_accessor :require, :worker_name, :db_config, :queue_db, :default_db, :process, :queue_timeout, :daemonize
+    attr_accessor :require, :worker_name, :db_config, :queue_db, :default_db, :process, :queue_timeout, :daemonize, :statistics
 
     DEFAULT = {
       require: '.',
@@ -12,7 +12,7 @@ module Shinq
     }
 
     def initialize(opts)
-      %i(require worker_name db_config queue_db default_db process queue_timeout daemonize).each do |k|
+      %i(require worker_name db_config queue_db default_db process queue_timeout daemonize statistics).each do |k|
         send(:"#{k}=", opts[k] || DEFAULT[k])
       end
     end

data/lib/shinq/statistics.rb

@@ -0,0 +1,17 @@
+require 'shinq/client'
+require 'active_support/inflector'
+
+module Shinq
+  module Statistics
+    def run
+      until @stop
+        p Shinq::Client.queue_stats(table_name: Shinq.configuration.worker_name.pluralize)
+        sleep Shinq.configuration.statistics
+      end
+    end
+
+    def stop
+      @stop = true
+    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       = '0.2.0'
+  spec.version       = '0.3.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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shinq
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Ryoichi SEKIGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-10 00:00:00.000000000 Z
+date: 2014-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -190,6 +190,7 @@ files:
 - lib/shinq/configuration.rb
 - lib/shinq/launcher.rb
 - lib/shinq/rails.rb
+- lib/shinq/statistics.rb
 - shinq.gemspec
 - spec/config/database.yml
 - spec/integration_spec.rb