message_bus 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65597f9dd4a3b22117b594ccaff431aa8ed63198
-  data.tar.gz: 66c1a2a4079eb8d685e6029f1c0a6da4ecb7b7d3
+  metadata.gz: 6909db1677e03068c2536f5576a123e371f946dd
+  data.tar.gz: a4aab49db0edf4340ca5cd84a9f6c4a75f2928bf
 SHA512:
-  metadata.gz: 6b5e51a5a51aec25039cef045b5c75cd4b27e610c7f96c7fa694aee4c7cc0a65b43be5224b8daed76f3a20908a8382baee9c20b15f281c5d76573c135599ea5e
-  data.tar.gz: 121e47af10c76c4ad0ffc7cd70f679632c9be4808adae2314ef977bafd82a341456feb5d18b2ac14827ee2abb4bf7723aad759df87ddab0330c054fd1787bfc2
+  metadata.gz: be441795c69094b47ac1860310ff33e35bb1a61920ed31f93bffd5425a13a505f6ff8d0a04b19779700ed457c263414be5daa6001c349925880958acd966bdd3
+  data.tar.gz: 455e07565586f43d12d89fbe7ee79177aad36973b5f4576d5cdafbebd9f9249b370df3f8023a77575c32e4cc697c4b4a44b501b161a6fcfec14d5021d808c811

data/.travis.yml

@@ -3,7 +3,8 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.2
+  - 2.2
 gemfile:
   - Gemfile
 services:
-    - redis-server
+  - redis-server

data/CHANGELOG

@@ -1,3 +1,8 @@
+08-06-2015
+- Version 1.0.14
+- Fix: we can not use Thread#kill best keepalive can do is terminate process cleanly
+- Feature: you can opt-out of keepalive with MessageBus.keepalive_timeout = 0
+
 08-06-2015
 - Version 1.0.13
 - Fix: on global subscribe reconnect replay missed messages

data/README.md

@@ -67,7 +67,7 @@ end
 
 MessageBus can be used in an environment that hosts multiple sites by multiplexing channels. To use this mode
 
-```
+```ruby
 # define a site_id lookup method
 MessageBus.site_id_lookup do
   some_method_that_returns_site_id_string

data/lib/message_bus.rb

@@ -328,6 +328,17 @@ module MessageBus::Implementation
     end
   end
 
+  # set to 0 to disable, anything higher and
+  # a keepalive will run every N seconds, if it fails
+  # process is killed
+  def keepalive_interval=(interval)
+    @keepalive_interval = interval
+  end
+
+  def keepalive_interval
+    @keepalive_interval || 60
+  end
+
   protected
 
   def global?(channel)
@@ -385,9 +396,10 @@ module MessageBus::Implementation
     end
   end
 
-  KEEPALIVE_INTERVAL = 60
+  MIN_KEEPALIVE = 20
 
   def new_subscriber_thread
+
     thread = Thread.new do
       begin
         global_subscribe_thread unless @destroyed
@@ -395,25 +407,36 @@ module MessageBus::Implementation
         MessageBus.logger.warn "Unexpected error in subscriber thread #{e}"
       end
     end
+
     blk = proc do
       if !@destroyed && thread.alive?
         publish("/__mb_keepalive__/", Process.pid, user_ids: [-1])
-        if Time.now - (@last_message || Time.now) > KEEPALIVE_INTERVAL*2
-          MessageBus.logger.warn "Global messages on #{Process.pid} timed out, restarting thread"
+        if (Time.now - (@last_message || Time.now)) > keepalive_interval*2
+          MessageBus.logger.warn "Global messages on #{Process.pid} timed out, restarting process"
           # No other clean way to remove this thread, its listening on a socket
           #   no data is arriving
           #
           # In production we see this kind of situation ... sometimes ... when there is
           # a VRRP failover, or weird networking condition
-          thread.kill
-          sleep 1
-          ensure_subscriber_thread
+          pid = Process.pid
+
+          # do the best we can to terminate self cleanly
+          fork do
+            Process.kill('TERM', pid)
+            sleep 10
+            Process.kill('KILL', pid)
+          end
+
+          sleep 10
+          Process.kill('KILL', pid)
+
         else
-          timer.queue(KEEPALIVE_INTERVAL, &blk)
+          timer.queue(keepalive_interval, &blk) if keepalive_interval > MIN_KEEPALIVE
         end
       end
     end
-    timer.queue(KEEPALIVE_INTERVAL, &blk)
+
+    timer.queue(keepalive_interval, &blk) if keepalive_interval > MIN_KEEPALIVE
 
     thread
   end
@@ -421,7 +444,7 @@ module MessageBus::Implementation
   def global_subscribe_thread
     # pretend we just got a message
     @last_message = Time.now
-    reliable_pub_sub.global_subscribe(@global_id) do |msg|
+    reliable_pub_sub.global_subscribe do |msg|
       begin
         @last_message = Time.now
         decode_message!(msg)
@@ -429,7 +452,6 @@ module MessageBus::Implementation
 
         @mutex.synchronize do
           raise MessageBus::BusDestroyed if @destroyed
-          @last_message_time = Time.now
           globals = @subscriptions[nil]
           locals = @subscriptions[msg.site_id] if msg.site_id
 

data/lib/message_bus/redis/reliable_pub_sub.rb

@@ -48,7 +48,7 @@ class MessageBus::Redis::ReliablePubSub
 
   def redis_channel_name
     db = @redis_config[:db] || 0
-    "discourse_#{db}"
+    "_message_bus_#{db}"
   end
 
   # redis connection used for publishing messages

data/lib/message_bus/version.rb

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

metadata

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