message_bus 2.0.2 → 2.0.3

data/lib/message_bus/backends/postgres.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'pg'
 
 module MessageBus::Postgres; end
@@ -30,37 +31,41 @@ class MessageBus::Postgres::Client
     @pid = Process.pid
   end
 
-  def add(channel, value)
-    hold{|conn| exec_prepared(conn, 'insert_message', [channel, value]){|r| r.getvalue(0,0).to_i}}
+  def add (channel, value)
+    hold { |conn| exec_prepared(conn, 'insert_message', [channel, value]) { |r| r.getvalue(0, 0).to_i } }
   end
 
   def clear_global_backlog(backlog_id, num_to_keep)
     if backlog_id > num_to_keep
-      hold{|conn| exec_prepared(conn, 'clear_global_backlog', [backlog_id - num_to_keep])}
+      hold { |conn| exec_prepared(conn, 'clear_global_backlog', [backlog_id - num_to_keep]) }
       nil
     end
   end
 
   def clear_channel_backlog(channel, backlog_id, num_to_keep)
-    hold{|conn| exec_prepared(conn, 'clear_channel_backlog', [channel, backlog_id, num_to_keep])}
+    hold { |conn| exec_prepared(conn, 'clear_channel_backlog', [channel, backlog_id, num_to_keep]) }
     nil
   end
 
   def expire(max_backlog_age)
-    hold{|conn| exec_prepared(conn, 'expire', [max_backlog_age])}
+    hold { |conn| exec_prepared(conn, 'expire', [max_backlog_age]) }
     nil
   end
 
   def backlog(channel, backlog_id)
-    hold{|conn| exec_prepared(conn, 'channel_backlog', [channel, backlog_id]){|r| r.values.each{|a| a[0] = a[0].to_i}}} || []
+    hold do |conn|
+      exec_prepared(conn, 'channel_backlog', [channel, backlog_id]) { |r| r.values.each { |a| a[0] = a[0].to_i } }
+    end || []
   end
 
   def global_backlog(backlog_id)
-    hold{|conn| exec_prepared(conn, 'global_backlog', [backlog_id]){|r| r.values.each{|a| a[0] = a[0].to_i}}} || []
+    hold do |conn|
+      exec_prepared(conn, 'global_backlog', [backlog_id]) { |r| r.values.each { |a| a[0] = a[0].to_i } }
+    end || []
   end
 
   def get_value(channel, id)
-    hold{|conn| exec_prepared(conn, 'get_message', [channel, id]){|r| r.getvalue(0,0)}}
+    hold { |conn| exec_prepared(conn, 'get_message', [channel, id]) { |r| r.getvalue(0, 0) } }
   end
 
   def reconnect
@@ -78,37 +83,37 @@ class MessageBus::Postgres::Client
     end
   end
 
-  def max_id(channel=nil)
+  def max_id(channel = nil)
     block = proc do |r|
       if r.ntuples > 0
-        r.getvalue(0,0).to_i
+        r.getvalue(0, 0).to_i
       else
         0
       end
     end
 
     if channel
-      hold{|conn| exec_prepared(conn, 'max_channel_id', [channel], &block)}
+      hold { |conn| exec_prepared(conn, 'max_channel_id', [channel], &block) }
     else
-      hold{|conn| exec_prepared(conn, 'max_id', &block)}
+      hold { |conn| exec_prepared(conn, 'max_id', &block) }
     end
   end
 
   def publish(channel, data)
-    hold{|conn| exec_prepared(conn, 'publish', [channel, data])}
+    hold { |conn| exec_prepared(conn, 'publish', [channel, data]) }
   end
 
   def subscribe(channel)
     obj = Object.new
-    sync{@listening_on[channel] = obj}
+    sync { @listening_on[channel] = obj }
     listener = Listener.new
     yield listener
-    
+
     conn = raw_pg_connection
     conn.exec "LISTEN #{channel}"
     listener.do_sub.call
     while listening_on?(channel, obj)
-      conn.wait_for_notify(10) do |_,_,payload|
+      conn.wait_for_notify(10) do |_, _, payload|
         break unless listening_on?(channel, obj)
         listener.do_message.call(nil, payload)
       end
@@ -120,7 +125,7 @@ class MessageBus::Postgres::Client
   end
 
   def unsubscribe
-    sync{@listening_on.clear}
+    sync { @listening_on.clear }
   end
 
   private
@@ -149,22 +154,22 @@ class MessageBus::Postgres::Client
       end
     end
 
-    if conn = sync{@allocated[Thread.current]}
+    if conn = sync { @allocated[Thread.current] }
       return yield(conn)
     end
-      
+
     begin
-      conn = sync{@available.shift} || new_pg_connection
-      sync{@allocated[Thread.current] = conn}
+      conn = sync { @available.shift } || new_pg_connection
+      sync { @allocated[Thread.current] = conn }
       yield conn
     rescue PG::ConnectionBad, PG::UnableToSend => e
       # don't add this connection back to the pool
     ensure
-      sync{@allocated.delete(Thread.current)}
+      sync { @allocated.delete(Thread.current) }
       if Process.pid != current_pid
-        sync{INHERITED_CONNECTIONS << conn}
+        sync { INHERITED_CONNECTIONS << conn }
       elsif conn && !e
-        sync{@available << conn}
+        sync { @available << conn }
       end
     end
   end
@@ -197,11 +202,11 @@ class MessageBus::Postgres::Client
   end
 
   def listening_on?(channel, obj)
-    sync{@listening_on[channel]} == obj
+    sync { @listening_on[channel] } == obj
   end
 
   def sync
-    @mutex.synchronize{yield}
+    @mutex.synchronize { yield }
   end
 end
 
@@ -251,7 +256,7 @@ class MessageBus::Postgres::ReliablePubSub
     client.reset!
   end
 
-  def publish(channel, data, queue_in_memory=true)
+  def publish(channel, data, queue_in_memory = true)
     client = self.client
     backlog_id = client.add(channel, data)
     msg = MessageBus::Message.new backlog_id, backlog_id, channel, data
@@ -322,7 +327,7 @@ class MessageBus::Postgres::ReliablePubSub
     @subscribed = false
   end
 
-  def global_subscribe(last_id=nil, &blk)
+  def global_subscribe(last_id = nil, &blk)
     raise ArgumentError unless block_given?
     highest_id = last_id
 
@@ -345,7 +350,7 @@ class MessageBus::Postgres::ReliablePubSub
           @subscribed = false
         end
 
-        on.message do |c,m|
+        on.message do |c, m|
           if m == UNSUB_MESSAGE
             @subscribed = false
             return

data/lib/message_bus/backends/redis.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require 'redis'
 # the heart of the message bus, it acts as 2 things
 #
@@ -80,7 +81,7 @@ class MessageBus::Redis::ReliablePubSub
     end
   end
 
-  def publish(channel, data, queue_in_memory=true)
+  def publish(channel, data, queue_in_memory = true)
     redis = pub_redis
     backlog_id_key = backlog_id_key(channel)
     backlog_key = backlog_key(channel)
@@ -122,21 +123,19 @@ class MessageBus::Redis::ReliablePubSub
     backlog_id
 
   rescue Redis::CommandError => e
-    if queue_in_memory &&
-          e.message =~ /^READONLY/
-
+    if queue_in_memory && e.message =~ /^READONLY/
       @lock.synchronize do
-        @in_memory_backlog << [channel,data]
+        @in_memory_backlog << [channel, data]
         if @in_memory_backlog.length > @max_in_memory_publish_backlog
           @in_memory_backlog.delete_at(0)
-          MessageBus.logger.warn("Dropping old message cause max_in_memory_publish_backlog is full")
+          MessageBus.logger.warn("Dropping old message cause max_in_memory_publish_backlog is full: #{e.message}\n#{e.backtrace.join('\n')}")
         end
       end
 
       if @flush_backlog_thread == nil
         @lock.synchronize do
           if @flush_backlog_thread == nil
-            @flush_backlog_thread = Thread.new{ensure_backlog_flushed}
+            @flush_backlog_thread = Thread.new { ensure_backlog_flushed }
           end
         end
       end
@@ -164,15 +163,15 @@ class MessageBus::Redis::ReliablePubSub
         end
 
         begin
-          publish(*@in_memory_backlog[0],false)
+          publish(*@in_memory_backlog[0], false)
         rescue Redis::CommandError => e
           if e.message =~ /^READONLY/
             try_again = true
           else
-            MessageBus.logger.warn("Dropping undeliverable message #{e}")
+            MessageBus.logger.warn("Dropping undeliverable message: #{e.message}\n#{e.backtrace.join('\n')}")
           end
         rescue => e
-          MessageBus.logger.warn("Dropping undeliverable message #{e}")
+          MessageBus.logger.warn("Dropping undeliverable message: #{e.message}\n#{e.backtrace.join('\n')}")
         end
 
         @in_memory_backlog.delete_at(0) unless try_again
@@ -208,7 +207,7 @@ class MessageBus::Redis::ReliablePubSub
     items.map! do |i|
       pipe = i.index "|"
       message_id = i[0..pipe].to_i
-      channel = i[pipe+1..-1]
+      channel = i[pipe + 1..-1]
       m = get_message(channel, message_id)
       m
     end
@@ -277,7 +276,7 @@ class MessageBus::Redis::ReliablePubSub
     end
   end
 
-  def global_subscribe(last_id=nil, &blk)
+  def global_subscribe(last_id = nil, &blk)
     raise ArgumentError unless block_given?
     highest_id = last_id
 
@@ -293,7 +292,6 @@ class MessageBus::Redis::ReliablePubSub
       end
     end
 
-
     begin
       @redis_global = new_redis_connection
 
@@ -313,7 +311,7 @@ class MessageBus::Redis::ReliablePubSub
           @subscribed = false
         end
 
-        on.message do |c,m|
+        on.message do |c, m|
           if m == UNSUB_MESSAGE
             @redis_global.unsubscribe
             return
@@ -344,7 +342,7 @@ class MessageBus::Redis::ReliablePubSub
   private
 
   def is_readonly?
-    key = "__mb_is_readonly".freeze
+    key = "__mb_is_readonly"
 
     begin
       # in case we are not connected to the correct server

data/lib/message_bus/client.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class MessageBus::Client
   attr_accessor :client_id, :user_id, :group_ids, :connect_time,
                 :subscribed_sets, :site_id, :cleanup_timer,
@@ -45,21 +46,21 @@ class MessageBus::Client
 
   def ensure_first_chunk_sent
     if use_chunked && @chunks_sent == 0
-      write_chunk("[]".freeze)
+      write_chunk("[]")
     end
   end
 
   def ensure_closed!
     return unless in_async?
     if use_chunked
-      write_chunk("[]".freeze)
+      write_chunk("[]")
       if @io
-        @io.write("0\r\n\r\n".freeze)
+        @io.write("0\r\n\r\n")
         @io.close
         @io = nil
       end
       if @async_response
-        @async_response << ("0\r\n\r\n".freeze)
+        @async_response << ("0\r\n\r\n")
         @async_response.done
         @async_response = nil
       end
@@ -117,21 +118,31 @@ class MessageBus::Client
 
   def backlog
     r = []
-    @subscriptions.each do |k,v|
+    new_message_ids = nil
+
+    @subscriptions.each do |k, v|
       next if v.to_i < 0
       messages = @bus.backlog(k, v, site_id)
+
       messages.each do |msg|
-        r << msg if allowed?(msg)
+        if allowed?(msg)
+          r << msg
+        else
+          new_message_ids ||= {}
+          new_message_ids[k] = msg.message_id
+        end
       end
     end
+
     # stats message for all newly subscribed
     status_message = nil
-    @subscriptions.each do |k,v|
-      if v.to_i == -1
+    @subscriptions.each do |k, v|
+      if v.to_i == -1 || (new_message_ids && new_message_ids[k])
         status_message ||= {}
         @subscriptions[k] = status_message[k] = @bus.last_id(k, site_id)
       end
     end
+
     r << MessageBus::Message.new(-1, -1, '/__status', status_message) if status_message
 
     r || []
@@ -139,9 +150,8 @@ class MessageBus::Client
 
   protected
 
-
   # heavily optimised to avoid all uneeded allocations
-  NEWLINE="\r\n".freeze
+  NEWLINE = "\r\n".freeze
   COLON_SPACE = ": ".freeze
   HTTP_11 = "HTTP/1.1 200 OK\r\n".freeze
   CONTENT_LENGTH = "Content-Length: ".freeze
@@ -154,7 +164,7 @@ class MessageBus::Client
 
   def write_headers
     @io.write(HTTP_11)
-    @headers.each do |k,v|
+    @headers.each do |k, v|
       next if k == "Content-Type"
       @io.write(k)
       @io.write(COLON_SPACE)

data/lib/message_bus/connection_manager.rb

@@ -1,10 +1,11 @@
+# frozen_string_literal: true
 require 'json' unless defined? ::JSON
 
 class MessageBus::ConnectionManager
   require 'monitor'
   include MonitorMixin
 
-  def initialize(bus=nil)
+  def initialize(bus = nil)
     @clients = {}
     @subscriptions = {}
     @bus = bus || MessageBus
@@ -53,7 +54,7 @@ class MessageBus::ConnectionManager
 
         @clients[client.client_id] = client
         @subscriptions[client.site_id] ||= {}
-        client.subscriptions.each do |k,v|
+        client.subscriptions.each do |k, v|
           subscribe_client(client, k)
         end
       end
@@ -79,7 +80,7 @@ class MessageBus::ConnectionManager
     end
   end
 
-  def subscribe_client(client,channel)
+  def subscribe_client(client, channel)
     synchronize do
       set = @subscriptions[client.site_id][channel]
       unless set

data/lib/message_bus/message.rb

@@ -1,18 +1,20 @@
+# frozen_string_literal: true
+
 class MessageBus::Message < Struct.new(:global_id, :message_id, :channel , :data)
 
   attr_accessor :site_id, :user_ids, :group_ids, :client_ids
 
   def self.decode(encoded)
     s1 = encoded.index("|")
-    s2 = encoded.index("|", s1+1)
-    s3 = encoded.index("|", s2+1)
+    s2 = encoded.index("|", s1 + 1)
+    s3 = encoded.index("|", s2 + 1)
 
-    MessageBus::Message.new(encoded[0..s1].to_i, encoded[s1+1..s2].to_i,
-                            encoded[s2+1..s3-1].gsub("$$123$$", "|"), encoded[s3+1..-1])
+    MessageBus::Message.new(encoded[0..s1].to_i, encoded[(s1 + 1)..s2].to_i,
+                            encoded[(s2 + 1)..(s3 - 1)].gsub("$$123$$", "|"), encoded[(s3 + 1)..-1])
   end
 
   # only tricky thing to encode is pipes in a channel name ... do a straight replace
   def encode
-    global_id.to_s << "|" << message_id.to_s << "|" << channel.gsub("|","$$123$$") << "|" << data
+    global_id.to_s << "|" << message_id.to_s << "|" << channel.gsub("|", "$$123$$") << "|" << data
   end
 end

data/lib/message_bus/rack/diagnostics.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module MessageBus::Rack; end
 
 class MessageBus::Rack::Diagnostics
@@ -48,7 +49,7 @@ class MessageBus::Rack::Diagnostics
   </body>
 </html>
 HTML
-    return [200, {"content-type" => "text/html;"}, [html]]
+    return [200, { "content-type" => "text/html;" }, [html]]
   end
 
   def translate_handlebars(name, content)
@@ -80,7 +81,7 @@ HTML
 
     if route =~ /^\/hup\//
       hostname, pid = route.split('/hup/')[1].split('/')
-      @bus.publish('/_diagnostics/hup', {hostname: hostname, pid: pid.to_i})
+      @bus.publish('/_diagnostics/hup', hostname: hostname, pid: pid.to_i)
       return [200, {}, ['ok']]
     end
 
@@ -89,9 +90,9 @@ HTML
       content = asset_contents(asset)
       split = asset.split('.')
       if split[1] == 'handlebars'
-        content = translate_handlebars(split[0],content)
+        content = translate_handlebars(split[0], content)
       end
-      return [200, {'content-type' => 'text/javascript;'}, [content]]
+      return [200, { 'content-type' => 'text/javascript;' }, [content]]
     end
 
     return [404, {}, ['not found']]