message_bus 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6909db1677e03068c2536f5576a123e371f946dd
-  data.tar.gz: a4aab49db0edf4340ca5cd84a9f6c4a75f2928bf
+  metadata.gz: b1ac114fd681f0af69bcfd05337dfbe4d01a7ec5
+  data.tar.gz: 8dccb7dcc0e2cfda466c3c86ab457c874e4c181c
 SHA512:
-  metadata.gz: be441795c69094b47ac1860310ff33e35bb1a61920ed31f93bffd5425a13a505f6ff8d0a04b19779700ed457c263414be5daa6001c349925880958acd966bdd3
-  data.tar.gz: 455e07565586f43d12d89fbe7ee79177aad36973b5f4576d5cdafbebd9f9249b370df3f8023a77575c32e4cc697c4b4a44b501b161a6fcfec14d5021d808c811
+  metadata.gz: 19e87e3c06a0044ca70161484aa0f121ee5fe2a99cbda8edf6bcecaf87258e8e6e68b2b1983073e8430c881a8b8df6f186b7cfa1e0218dfa0350784c44cdbbcc
+  data.tar.gz: 23baa4e52b0dd3f660c7b0fdca2055571735d7d09a794ec84bf83fe8ad046f3ecaefff6db002a46cf9036e6d7ef6a601d9596eb7b7bb22b77389567f027bdf47

data/CHANGELOG

@@ -1,3 +1,9 @@
+09-07-2015
+- Version 1.0.15
+- Feature: MessageBus.reliable_pub_sub.max_backlog_age (in secs) configurable (default to 7 days)
+- Fix: API for MessageBus.backlog("/bla") was returning global backlog by mistake
+- Change: Max global backlog size reduced to 2000 elements
+
 08-06-2015
 - Version 1.0.14
 - Fix: we can not use Thread#kill best keepalive can do is terminate process cleanly

data/README.md

@@ -99,6 +99,18 @@ MessageBus.subscribe("/channel", function(data){
 
 ```
 
+## Configuration
+
+### Redis
+
+You can configure redis setting in `config/initializers/message_bus.rb`, like
+
+```ruby
+MessageBus.redis_config = { url: "redis://:p4ssw0rd@10.0.1.1:6380/15" }
+```
+The redis client message_bus uses is [redis-rb](https://github.com/redis/redis-rb), so you can visit it's repo to see what options you can configure.
+
+
 ## Similar projects
 
 Faye - http://faye.jcoglan.com/

data/lib/message_bus.rb

@@ -264,7 +264,11 @@ module MessageBus::Implementation
     subscribe_impl(channel, site_id, &blk)
   end
 
-  def backlog(channel=nil, last_id)
+  def global_backlog(last_id=nil)
+    backlog(nil, last_id)
+  end
+
+  def backlog(channel=nil, last_id=nil)
     old =
       if channel
         reliable_pub_sub.backlog(encode_channel_name(channel), last_id)

data/lib/message_bus/redis/reliable_pub_sub.rb

@@ -11,7 +11,8 @@ module MessageBus::Redis; end
 class MessageBus::Redis::ReliablePubSub
   attr_reader :subscribed
   attr_accessor :max_publish_retries, :max_publish_wait, :max_backlog_size,
-                :max_global_backlog_size, :max_in_memory_publish_backlog
+                :max_global_backlog_size, :max_in_memory_publish_backlog,
+                :max_backlog_age
 
   UNSUB_MESSAGE = "$$UNSUBSCRIBE"
 
@@ -28,14 +29,15 @@ class MessageBus::Redis::ReliablePubSub
   def initialize(redis_config = {}, max_backlog_size = 1000)
     @redis_config = redis_config
     @max_backlog_size = max_backlog_size
-    # we can store a lot of messages, since only one queue
-    @max_global_backlog_size = 100000
+    @max_global_backlog_size = 2000
     @max_publish_retries = 10
     @max_publish_wait = 500 #ms
     @max_in_memory_publish_backlog = 1000
     @in_memory_backlog = []
     @lock = Mutex.new
     @flush_backlog_thread = nil
+    # after 7 days inactive backlogs will be removed
+    @max_backlog_age = 604800
   end
 
   def new_redis_connection
@@ -98,17 +100,24 @@ class MessageBus::Redis::ReliablePubSub
     msg = MessageBus::Message.new global_id, backlog_id, channel, data
     payload = msg.encode
 
-    redis.zadd backlog_key, backlog_id, payload
-    redis.zadd global_backlog_key, global_id, backlog_id.to_s << "|" << channel
+    redis.multi do |m|
 
-    redis.publish redis_channel_name, payload
+      redis.zadd backlog_key, backlog_id, payload
+      redis.expire backlog_key, @max_backlog_age
 
-    if backlog_id > @max_backlog_size
-      redis.zremrangebyscore backlog_key, 1, backlog_id - @max_backlog_size
-    end
+      redis.zadd global_backlog_key, global_id, backlog_id.to_s << "|" << channel
+      redis.expire global_backlog_key, @max_backlog_age
+
+      redis.publish redis_channel_name, payload
+
+      if backlog_id > @max_backlog_size
+        redis.zremrangebyscore backlog_key, 1, backlog_id - @max_backlog_size
+      end
+
+      if global_id > @max_global_backlog_size
+        redis.zremrangebyscore global_backlog_key, 1, global_id - @max_global_backlog_size
+      end
 
-    if global_id > @max_global_backlog_size
-      redis.zremrangebyscore global_backlog_key, 1, global_id - @max_global_backlog_size
     end
 
     backlog_id

data/lib/message_bus/version.rb

@@ -1,3 +1,3 @@
 module MessageBus
-  VERSION = "1.0.14"
+  VERSION = "1.0.15"
 end

data/spec/lib/message_bus_spec.rb

@@ -115,6 +115,15 @@ describe MessageBus do
     r.map{|i| i.data}.to_a.should == ['foo', 'bar']
   end
 
+  it "should correctly get full backlog of a channel" do
+    @bus.publish("/chuck", "norris")
+    @bus.publish("/chuck", "foo")
+    @bus.publish("/chuckles", "bar")
+
+    @bus.backlog("/chuck").map{|i| i.data}.to_a.should == ['norris', 'foo']
+
+  end
+
   it "allows you to look up last_message" do
     @bus.publish("/bob", "dylan")
     @bus.publish("/bob", "marley")
@@ -201,7 +210,7 @@ describe MessageBus do
 
       $stdout.reopen("/dev/null", "w")
       $stderr.reopen("/dev/null", "w")
-     
+
       # having some issues with exit here
       # TODO find and fix
       Process.kill "KILL", Process.pid

data/spec/lib/redis/reliable_pub_sub_spec.rb

@@ -37,6 +37,13 @@ describe MessageBus::Redis::ReliablePubSub do
     end
   end
 
+  it "can set backlog age" do
+    @bus.max_backlog_age = 100
+    @bus.publish "/foo", "bar"
+    @bus.pub_redis.ttl(@bus.backlog_key("/foo")).should be <= 100
+    @bus.pub_redis.ttl(@bus.backlog_key("/foo")).should be > 0
+  end
+
   it "should be able to access the backlog" do
     @bus.publish "/foo", "bar"
     @bus.publish "/foo", "baz"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-23 00:00:00.000000000 Z
+date: 2015-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack