message_bus 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6609e7158e64715d6113ffb1c2d61d99c919d16b
-  data.tar.gz: d561cb2c1342bc50cca592676f7f45c6eb50326e
+  metadata.gz: 6aa05eed76182bd5fe219675994c62e4bbab64a4
+  data.tar.gz: cbc5bb1dee813ae31140818862684fb000640e0d
 SHA512:
-  metadata.gz: 9f42d527e19b5a9e15edabb29198a860447fb2e57697b2d946aa1bac26e5d2c8eec860a8839ff6fede461e61a050c806ae9fbfba39ff6e2ae0a945238d3921e6
-  data.tar.gz: 271dc3f565aa0dde4f2e513f5fb9cddaf4e59680bbe5b87136708c042020de47c9469cdf56d8f9d5025ce1272138e9ac7b4adfde5713ed896b7a9002bf8cbc42
+  metadata.gz: 74a3cf289846f5d2f69562655ca2da052e62f9c069be0e4ecc6621031511da9595f35992130266e622ea707fa808b2e80ba2a7af3919067de9fec4c165c4e026
+  data.tar.gz: 67f93e82846a5ca0ead95bd1cc3aa04de4ef284ba9142d2b6127c8631bdcfb422be74a665129f150fe0c70615d52ea1341737e0b0f2ce87db6c7daae2f587161

data/CHANGELOG

@@ -1,5 +1,11 @@
 18-12-2017
 
+- Version 2.1.1
+
+- FEATURE: allow setting of max_backlog_size and max_backlog_age on publish for redis provider
+
+18-12-2017
+
 - Version 2.1.0
 
 - FEATURE: you can now lookup last N messages on channel on subscribe from JavaScript

data/lib/message_bus/backends/memory.rb

@@ -164,7 +164,7 @@ class MessageBus::Memory::ReliablePubSub
     client.reset!
   end
 
-  def publish(channel, data, queue_in_memory = true)
+  def publish(channel, data, opts = nil)
     client = self.client
     backlog_id = client.add(channel, data)
     if backlog_id % clear_every == 0

data/lib/message_bus/backends/postgres.rb

@@ -31,7 +31,7 @@ class MessageBus::Postgres::Client
     @pid = Process.pid
   end
 
-  def add (channel, value)
+  def add(channel, value)
     hold { |conn| exec_prepared(conn, 'insert_message', [channel, value]) { |r| r.getvalue(0, 0).to_i } }
   end
 
@@ -256,7 +256,10 @@ class MessageBus::Postgres::ReliablePubSub
     client.reset!
   end
 
-  def publish(channel, data, queue_in_memory = true)
+  def publish(channel, data, opts = nil)
+
+    # TODO in memory queue?
+
     client = self.client
     backlog_id = client.add(channel, data)
     msg = MessageBus::Message.new backlog_id, backlog_id, channel, data

data/lib/message_bus/backends/redis.rb

@@ -125,7 +125,12 @@ LUA
 
   LUA_PUBLISH_SHA1 = Digest::SHA1.hexdigest(LUA_PUBLISH)
 
-  def publish(channel, data, queue_in_memory = true)
+  def publish(channel, data, opts = nil)
+    queue_in_memory = (opts && opts[:queue_in_memory]) != false
+
+    max_backlog_age = (opts && opts[:max_backlog_age]) || self.max_backlog_age
+    max_backlog_size = (opts && opts[:max_backlog_size]) || self.max_backlog_size
+
     redis = pub_redis
     backlog_id_key = backlog_id_key(channel)
     backlog_key = backlog_key(channel)
@@ -190,7 +195,8 @@ LUA
         end
 
         begin
-          publish(*@in_memory_backlog[0], false)
+          # TODO recover special options
+          publish(*@in_memory_backlog[0], queue_in_memory: false)
         rescue Redis::CommandError => e
           if e.message =~ /^READONLY/
             try_again = true

data/lib/message_bus/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module MessageBus
-  VERSION = "2.1.0"
+  VERSION = "2.1.1"
 end

data/lib/message_bus.rb

@@ -236,7 +236,16 @@ module MessageBus::Implementation
       client_ids: client_ids
     )
 
-    reliable_pub_sub.publish(encode_channel_name(channel), encoded_data)
+    channel_opts = nil
+
+    if opts && ((age = opts[:max_backlog_age]) || (size = opts[:max_backlog_size]))
+      channel_opts = {
+        max_backlog_size: size,
+        max_backlog_age: age
+      }
+    end
+
+    reliable_pub_sub.publish(encode_channel_name(channel), encoded_data, channel_opts)
   end
 
   def blocking_subscribe(channel = nil, &blk)

data/spec/lib/message_bus/backends/redis_spec.rb

@@ -52,6 +52,24 @@ if MESSAGE_BUS_CONFIG[:backend] == :redis
       @bus.pub_redis.ttl(@bus.backlog_key("/foo")).must_be :>, 0
     end
 
+    it "can set backlog age on publish" do
+      @bus.max_backlog_age = 100
+
+      @bus.publish "/foo", "bar", max_backlog_age: 50
+      @bus.pub_redis.ttl(@bus.backlog_key("/foo")).must_be :<=, 50
+      @bus.pub_redis.ttl(@bus.backlog_key("/foo")).must_be :>, 0
+    end
+
+    it "can set backlog size on publish" do
+      @bus.max_backlog_size = 100
+
+      @bus.publish "/foo", "bar", max_backlog_size: 2
+      @bus.publish "/foo", "bar", max_backlog_size: 2
+      @bus.publish "/foo", "bar", max_backlog_size: 2
+
+      @bus.backlog("/foo").length.must_equal 2
+    end
+
     it "should be able to access the backlog" do
       @bus.publish "/foo", "bar"
       @bus.publish "/foo", "baz"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Sam Saffron