insque 0.4.3 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 70aa885c8cc1912103b4665f966d52be327e708c
-  data.tar.gz: 2e959689e93d83c06b650707c77133584e91bb4e
+  metadata.gz: db352d3e0afe2bfd0243f0e9cd15a905226ae4fe
+  data.tar.gz: 9ea0abcc665e264a0c51d1be4a20a9ba3e8d1ce7
 SHA512:
-  metadata.gz: 7b8e5e447ef3c36d25dc6ec35039dc9dc1c2c52ae39a84dc88822a13ef3a952843328126334bf2c05dee1d87fd9a7cbfd9d9b5b888b04011e6ebb61d7aac5d40
-  data.tar.gz: 6a963d0087f28a16ba83fb36a564258bca79a609d2984bdccbb782ebeb920b84c4533ab6c58b623e34c1bcac0af4c3067b5f468535a48ed78aff00b8b6d0310a
+  metadata.gz: cf57b0954f22ce0f5628df247942a732af6b4e61fab2b85667651107408091703f7ec733eaed175cd9f54911ca665a5c6d9dffebb55c06beb7c0de9a6c129970
+  data.tar.gz: 2c2d5ae8ba1839d06b2f50519754c38ec2476178a88805570b099f32c63c95edcd4d3e91be05c30e4ed183edd862052b1b64cc8593281021419372b7dcd53663

data/insque.gemspec

@@ -5,8 +5,9 @@ Gem::Specification.new do |gem|
   gem.authors       = ["gropher"]
   gem.email         = ["grophen@gmail.com"]
   gem.description   = "Instant queue. Background processing and message driven communication tool. Faster and simplier alternative to Resque."
-  gem.summary       = "Instant queue. Background processing and message driven communication tool. Faster and simplier alternative to Resque."
+  gem.summary       = "Redis-based multi-threaded queue"
   gem.homepage      = "https://github.com/Gropher/Insque"
+  gem.licenses      = ['MIT']
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
@@ -15,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Insque::VERSION
   
-  gem.add_dependency('redis', '>= 2.2.2' )
+  gem.add_dependency('redis', '~> 2.2', '>= 2.2.2')
 end

data/lib/insque/version.rb

@@ -1,3 +1,3 @@
 module Insque
-  VERSION = "0.4.3"
+  VERSION = "0.5.1"
 end

data/lib/insque.rb

@@ -7,16 +7,33 @@ module Insque
     @debug = debug
   end
 
+  def self.redis= redis
+    @redis = redis
+  end
+
+  def self.redis
+    @redis
+  end
+
+  def self.redis_class= klass
+    @redis_class = klass
+  end
+
+  def self.redis_config
+    @redis_config
+  end
+
   def self.redis_config= redis
     @redis_config = redis
-    @redis = Redis.new @redis_config
-    @redis.select 7
+    @redis = self.create_redis_connection
   end
 
   def self.sender= sender
     @sender = sender
-    @inbox = "insque_inbox_#{sender}"
-    @processing = "insque_processing_#{sender}"
+    @inbox = "{insque}inbox_#{sender}"
+    @processing = "{insque}processing_#{sender}"
+    @slow_inbox = "{insque}slow_inbox_#{sender}"
+    @slow_processing = "{insque}slow_processing_#{sender}"
     create_send_later_handler
   end
 
@@ -24,9 +41,11 @@ module Insque
     keys = []
     case recipient
     when :any
-      keys = @redis.smembers 'insque_inboxes'
+      keys = @redis.smembers '{insque}inboxes'
     when :self
       keys = [@inbox]
+    when :slow
+      keys = [@slow_inbox]
     else
       keys = recipient.is_a?(Array) ? recipient : [recipient]
     end
@@ -37,14 +56,29 @@ module Insque
     end
   end
 
-  def self.listen worker_name=''
-    redis = Redis.new @redis_config
-    redis.select 7
+  def self.listen worker_name='', redis=nil
+    redis ||= create_redis_connection
+    redis.sadd '{insque}inboxes', @inbox
+    do_listen @inbox, @processing, redis, worker_name
+  end
 
-    redis.sadd 'insque_inboxes', @inbox
-    log "#{worker_name} START LISTENING #{@inbox}"
+  def self.slow_listen worker_name='', redis=nil
+    do_listen @slow_inbox, @slow_processing, (redis || create_redis_connection), worker_name
+  end
+
+  def self.janitor redis=nil
+    real_janitor @inbox, @processing, (redis || create_redis_connection)
+  end
+
+  def self.slow_janitor redis=nil
+    real_janitor @slow_inbox, @slow_processing, (redis || create_redis_connection)
+  end
+
+private
+  def self.do_listen inbox, processing, redis, worker_name
+    log "#{worker_name} START LISTENING #{inbox}"
     loop do
-      message = redis.brpoplpush(@inbox, @processing, 0)
+      message = redis.brpoplpush(inbox, processing, 0)
       log "#{worker_name} RECEIVING: #{message}" if @debug
       begin
         parsed_message = JSON.parse message
@@ -54,20 +88,17 @@ module Insque
         log e.inspect
         log e.backtrace
       end
-      redis.lrem @processing, 0, message
+      redis.lrem processing, 0, message
     end
   end
 
-  def self.janitor
-    redis = Redis.new @redis_config
-    redis.select 7
-
+  def self.real_janitor inbox, processing, redis
     loop do
-      redis.watch @processing
+      redis.watch processing
       errors = []
       restart = []
       delete = []
-      redis.lrange(@processing, 0, -1).each do |m|
+      redis.lrange(processing, 0, -1).each do |m|
         begin
           parsed_message = JSON.parse(m)
           if parsed_message['restarted_at'] && DateTime.parse(parsed_message['restarted_at']) < 1.hour.ago.utc
@@ -82,8 +113,8 @@ module Insque
         end
       end
       result = redis.multi do |r|
-        restart.each {|m| r.lpush @inbox, m.to_json }
-        delete.each {|m| r.lrem @processing, 0, m }
+        restart.each {|m| r.lpush inbox, m.to_json }
+        delete.each {|m| r.lrem processing, 0, m }
       end
       if result
         errors.each {|m| log "ERROR: #{m.to_json}" }
@@ -96,7 +127,10 @@ module Insque
     end
   end
 
-private
+  def self.create_redis_connection
+    (@redis_class || Redis).new @redis_config
+  end 
+
   def self.log message
     print "#{Time.now.utc} #{message}\n"
     STDOUT.flush if @debug
@@ -112,14 +146,14 @@ end
 if defined?(ActiveRecord::Base)
   class ActiveRecord::Base
     def send_later(method, *args)
-      Insque.broadcast :send_later, {:class => self.class.name, :id => id, :method => method, :args => args }, :self
+      Insque.broadcast :send_later, {:class => self.class.name, :id => id, :method => method, :args => args }, :slow
     end
     def self.acts_as_insque_crud(*args)
       options = args.extract_options!
       excluded = (options[:exclude] || []).map(&:to_s)
 
       set_callback :commit, :after do
-        action = [:create, :update, :destroy].map {|a| a if transaction_include_action?(a) }.compact.first
+        action = [:create, :update, :destroy].map {|a| a if transaction_include_any_action?([a]) }.compact.first
         params = self.serializable_hash(options).delete_if {|key| (['created_at', 'updated_at'] + excluded).include? key}
         Insque.broadcast :"#{self.class.to_s.underscore}_#{action}", params
       end

data/lib/tasks/insque.rake

@@ -5,6 +5,8 @@ namespace :insque do
     threads = []
     threads << Thread.new() { Insque.listen }
     threads << Thread.new() { Insque.janitor }
+    threads << Thread.new() { Insque.slow_listen }
+    threads << Thread.new() { Insque.slow_janitor }
     threads.each {|t| t.join }
   end
 

metadata

@@ -1,19 +1,22 @@
 --- !ruby/object:Gem::Specification
 name: insque
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.5.1
 platform: ruby
 authors:
 - gropher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-21 00:00:00.000000000 Z
+date: 2017-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
@@ -21,6 +24,9 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 2.2.2
@@ -46,7 +52,8 @@ files:
 - lib/insque/version.rb
 - lib/tasks/insque.rake
 homepage: https://github.com/Gropher/Insque
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -67,7 +74,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: Instant queue. Background processing and message driven communication tool.
-  Faster and simplier alternative to Resque.
+summary: Redis-based multi-threaded queue
 test_files: []
-has_rdoc: