insque 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 01104bacbddad2fd85675e9f242aea346d3101c9
-  data.tar.gz: a3debfd746d82c059abf4f6423f1aa9bb2f6baf4
+  metadata.gz: a6bc4d6a0e64d20aa174ad1edb4e7b0800db567f
+  data.tar.gz: 0c055a801704a918e7f5c54de6c13a6d2a4aa855
 SHA512:
-  metadata.gz: 8d2e64b82459b0268286ec5c9d2e9dd5209f58e99dbd8ac70f0bb734886e7f607b6cd0c4a2e3e40efd79552629e2791193fda349432f26c9cd0267f72b418a1c
-  data.tar.gz: 4240f9fb0a74cae2a5bf7b416b8ecc506d8fad44bf83562af008ecbc97d1c51bb505c4436dbf882c02f9edfc8cd31d3e9de5cc8ed42be999c3ca3d7ed0642246
+  metadata.gz: fc420d9a911864023ec1f2a99fbba467228f349a3363be2bda5edf254b24f10dca161a251f600835c95ff9897de9ea51aa8949c102fde3dc756e53c187b46689
+  data.tar.gz: 92a6ae35dd54be1e6db13a7dcb47b9a5694be04817752ef0479c05364a5ddd182047174e8ea571028db14703d0cc3934e268f5db9a6b256feb30e86344812ee5

data/README.md

@@ -4,7 +4,7 @@ Instant queue. Background processing and message driven communication tool. Fast
 
 ## Installation
 
-Add this line to your application's Gemfile:
+Add this line to your application's `Gemfile`:
 
     gem 'insque'
 
@@ -29,12 +29,19 @@ To broadcast message use:
 ```ruby
 Insque.broadcast :message_name, {:params => {:some => :params}}
 ```
-There is an easy way to use insque as background jobs processing. You can use `send_later` method to call any method of your rails models in background
-. You still need listener running to make this work.
+There is an easy way to use insque as background jobs processing. You can use `send_later` method to call any method of your rails models in background:
 ```ruby
 @model = MyModel.first
 @model.send_later :mymethod, 'some', 'params'
 ```
+You'll need a special slow listener running to make this work.
+```ruby
+Insque.slow_listen
+```
+there is a matching slow janitor as well:
+```ruby
+Insque.slow_janitor
+```
 
 ### Recieving
 
@@ -61,28 +68,14 @@ To start recieving messages you need to:
 
    or just run `bundle exec rake insque:janitor` from your console.
 
-### Slow Queue and send_later
-
-Insque can be used for processing slow tasks in background. Slow tasks created with send_later method call of any ActiveRecord model:
-```ruby
-User.send_later :some_slow_method
-```
-and processed by a special slow listener:
-```ruby
-Insque.slow_listen
-```
-there is matching slow janitor as well:
-```ruby
-Insque.slow_janitor
-```
-### insque:run
+### Run All At Once
 
 There is a simple way to run all insque workers, both regular and slow in a single multi-threaded process:
 ```ruby
 bundle exec rake insque:run
 ```
 
-### RedisCluster support
+### Redis Cluster Support
 
 To make insque run on Redis Cluster add this line to your application's `Gemfile`:
 

data/insque.gemspec

@@ -16,5 +16,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Insque::VERSION
   
-  gem.add_dependency('redis', '~> 2.2', '>= 2.2.2')
+  gem.add_dependency('redis', '> 2')
 end

data/lib/insque/version.rb

@@ -1,3 +1,3 @@
 module Insque
-  VERSION = "0.5.2"
+  VERSION = "0.6.0"
 end

data/lib/insque.rb

@@ -3,6 +3,16 @@ require "redis"
 require "insque/railtie" if defined?(Rails)
 
 module Insque
+  DEFAULT_INBOX_TTL = 10800 # seconds
+
+  def self.inbox_ttl= val
+    @inbox_ttl = val
+  end
+
+  def self.inbox_ttl
+    @inbox_ttl || DEFAULT_INBOX_TTL
+  end
+
   def self.debug= debug
     @debug = debug
   end
@@ -31,6 +41,7 @@ module Insque
   def self.sender= sender
     @sender = sender
     @inbox = "{insque}inbox_#{sender}"
+    @inbox_pointer = "{insque}inbox_pointer_#{sender}"
     @processing = "{insque}processing_#{sender}"
     @slow_inbox = "{insque}slow_inbox_#{sender}"
     @slow_processing = "{insque}slow_processing_#{sender}"
@@ -41,7 +52,7 @@ module Insque
     keys = []
     case recipient
     when :any
-      keys = @redis.smembers '{insque}inboxes'
+      keys = @redis.mget *@redis.keys('{insque}inbox_pointer_*')
     when :self
       keys = [@inbox]
     when :slow
@@ -58,8 +69,7 @@ module Insque
 
   def self.listen worker_name='', redis=nil
     redis ||= create_redis_connection
-    redis.sadd '{insque}inboxes', @inbox
-    do_listen @inbox, @processing, redis, worker_name
+    do_listen @inbox, @processing, redis, worker_name, @inbox_pointer
   end
 
   def self.slow_listen worker_name='', redis=nil
@@ -75,14 +85,16 @@ module Insque
   end
 
 private
-  def self.do_listen inbox, processing, redis, worker_name
+  def self.do_listen inbox, processing, redis, worker_name, pointer=nil
     log "#{worker_name} START LISTENING #{inbox}"
     loop do
+      redis.setex(pointer, inbox_ttl, inbox) if pointer
       message = redis.brpoplpush(inbox, processing, 0)
       log "#{worker_name} RECEIVING: #{message}" if @debug
       begin
         parsed_message = JSON.parse message
-        send(parsed_message['message'], parsed_message) if self.respond_to? parsed_message['message']
+        send(parsed_message['message'], parsed_message) 
+      rescue NoMethodError
       rescue => e
         log "#{worker_name} ========== BROKEN_MESSAGE: #{message} =========="
         log e.inspect

data/lib/tasks/insque.rake

@@ -2,6 +2,7 @@ namespace :insque do
   desc 'Starts insque listener and janitor'
   task :run => :environment do
     trap('TERM') { puts "SIGTERM"; exit 0 }
+    Thread.abort_on_exception=true
     threads = []
     threads << Thread.new() { Insque.listen }
     threads << Thread.new() { Insque.janitor }
@@ -13,12 +14,14 @@ namespace :insque do
   desc 'Starts insque listener'
   task :listener => :environment do
     trap('TERM') { puts "SIGTERM"; exit 0 }
+    Thread.abort_on_exception=true
     Insque.listen
   end
 
   desc 'Starts insque janitor'
   task :janitor => :environment do
     trap('TERM') { puts "SIGTERM"; exit 0 }
+    Thread.abort_on_exception=true
     Insque.janitor
   end
 end

metadata

@@ -1,35 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: insque
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - gropher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-10 00:00:00.000000000 Z
+date: 2018-03-08 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
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.2'
-    - - ">="
+    - - ">"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: '2'
 description: Instant queue. Background processing and message driven communication
   tool. Faster and simplier alternative to Resque.
 email: