shinq 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1c2780c72c0818659e65f0cf005dcd19d78cb3cb
-  data.tar.gz: 48fc9366fb03e2efc32df1d865e9358a920db6ff
+  metadata.gz: b924bc9aa5b90d80b12a87648a79556806e05afb
+  data.tar.gz: f819bc9b7d685856fd493f962c13d0cdbd8ee841
 SHA512:
-  metadata.gz: 51fc1856fd6ced06b6f54c483cd6235dd9d095cb9de3359c278f1776ec0c0d7dd106b2fa1acd8c0a9ee095b941dfb35fdb5675459a2122823265a3d6e3420139
-  data.tar.gz: d8b4bc498f2db51975cde120f6e8ae5815fce0365c86bad579dbb6ccf342d4f30ad8760fc431649cafb59f71b606db7c827530c7d0f284db1d39768bc64e4c6e
+  metadata.gz: 02779081ac90c7e27bdf1838e16546beb3381e9756f885361239b0bf03c73d4371fd8bc12f59ba73848bead48ee5a4a3884aa70a608e67ed1174eee5124d08ea
+  data.tar.gz: 4b618dfc9164a2de53d1a6ef65de9566644d94ea9e36e8947c2735ca044e910c48a7301c32f66d69346dec285adb8e590fd96ad75642309943316da558bac5d5

data/lib/shinq.rb

@@ -31,6 +31,14 @@ module Shinq
     @connections ||= {}
     @connections[db_name] ||= setup_db_connection(db_name)
   end
+
+  def self.logger
+    @logger
+  end
+
+  def self.logger=(log)
+    @logger = log
+  end
 end
 
 require 'shinq/rails' if defined?(::Rails::Engine)

data/lib/shinq/cli.rb

@@ -4,6 +4,7 @@ require 'shinq'
 require 'shinq/launcher'
 require 'shinq/statistics'
 require 'shinq/configuration'
+require 'shinq/logger'
 require 'serverengine'
 
 module Shinq
@@ -54,6 +55,10 @@ module Shinq
           opts[:require] = v
         end
 
+        opt.on('-l', '--max-lifecycle VALUE', 'Refork process when loopnumber is over specify number') do |v|
+          opts[:lifecycle] = v.to_i
+        end
+
         opt.on('-s', '--statistics VALUE', 'Display queue statistics interval time(sec)') do |v|
           opts[:statistics] = v.to_i
         end
@@ -74,6 +79,7 @@ module Shinq
 
     def bootstrap
       target = options.require
+      Shinq.logger = Shinq::Logger.logger
 
       if File.directory?(target)
         require 'rails'
@@ -93,7 +99,8 @@ module Shinq
         daemonize: options.daemonize,
         worker_type: 'process',
         pid_file: 'shinq.pid',
-        workers: options.process
+        workers: options.process,
+        logger: options.daemonize ? Shinq.logger : nil
       })
 
       se.run

data/lib/shinq/client.rb

@@ -47,7 +47,7 @@ module Shinq
       end
 
       stats.merge(
-        queue_count: stats[:rows_removed] - stats[:rows_written]
+        queue_count: stats[:rows_written] - stats[:rows_removed]
       )
     end
 

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, :statistics
+    attr_accessor :require, :worker_name, :db_config, :queue_db, :default_db, :process, :queue_timeout, :daemonize, :statistics, :lifecycle
 
     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 statistics).each do |k|
+      %i(require worker_name db_config queue_db default_db process queue_timeout daemonize statistics lifecycle).each do |k|
         send(:"#{k}=", opts[k] || DEFAULT[k])
       end
     end

data/lib/shinq/launcher.rb

@@ -7,10 +7,11 @@ module Shinq
       worker_name = Shinq.configuration.worker_name
       worker_class = worker_name.camelize.constantize
 
+      @loop_count = 0
+
       until @stop
         queue = Shinq::Client.dequeue(table_name: worker_name.pluralize)
-        #TODO use logger
-        next p "Queue is empty (#{Time.now})" unless queue
+        next Shinq.logger.info("Queue is empty (#{Time.now})") unless queue
 
         begin
           worker_class.new.perform(queue)
@@ -20,11 +21,23 @@ module Shinq
         end
 
         Shinq::Client.done
+
+        @loop_count += 1
+
+        if lifecycle_limit?
+          Shinq.logger.info("Lifecycle Limit pid(#{Process.pid})")
+          break
+        end
       end
     end
 
     def stop
       @stop = true
     end
+
+    def lifecycle_limit?
+      return false unless Shinq.configuration.lifecycle
+      return (Shinq.configuration.lifecycle < @loop_count)
+    end
   end
 end

data/lib/shinq/logger.rb

@@ -0,0 +1,17 @@
+require 'logger'
+
+module Shinq
+  class Logger
+    def self.initialize_logger
+      @logger = ::Logger.new(STDOUT)
+    end
+
+    def self.logger=(log)
+      @logger = log
+    end
+
+    def self.logger
+      @logger ? @logger : initialize_logger
+    end
+  end
+end

data/lib/shinq/rails.rb

@@ -9,6 +9,7 @@ module Shinq
     def self.rails_bootstrap
       Shinq.configuration.db_config = ActiveRecord::Base.configurations
       Shinq.configuration.default_db = ::Rails.env
+      Shinq.logger = ::Rails.logger if Shinq.configuration.daemonize
     end
   end
 end

data/lib/shinq/statistics.rb

@@ -5,7 +5,7 @@ module Shinq
   module Statistics
     def run
       until @stop
-        p Shinq::Client.queue_stats(table_name: Shinq.configuration.worker_name.pluralize)
+        Shinq.logger.info Shinq::Client.queue_stats(table_name: Shinq.configuration.worker_name.pluralize)
         sleep Shinq.configuration.statistics
       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.3.0'
+  spec.version       = '0.4.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

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shinq
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Ryoichi SEKIGUCHI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -189,6 +189,7 @@ files:
 - lib/shinq/client.rb
 - lib/shinq/configuration.rb
 - lib/shinq/launcher.rb
+- lib/shinq/logger.rb
 - lib/shinq/rails.rb
 - lib/shinq/statistics.rb
 - shinq.gemspec