message_bus 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1ac114fd681f0af69bcfd05337dfbe4d01a7ec5
-  data.tar.gz: 8dccb7dcc0e2cfda466c3c86ab457c874e4c181c
+  metadata.gz: f42e4714f39aecb865965bb91a089a5bcd7a8670
+  data.tar.gz: ab929f4b40c6ea23d6f680392da942234ec02457
 SHA512:
-  metadata.gz: 19e87e3c06a0044ca70161484aa0f121ee5fe2a99cbda8edf6bcecaf87258e8e6e68b2b1983073e8430c881a8b8df6f186b7cfa1e0218dfa0350784c44cdbbcc
-  data.tar.gz: 23baa4e52b0dd3f660c7b0fdca2055571735d7d09a794ec84bf83fe8ad046f3ecaefff6db002a46cf9036e6d7ef6a601d9596eb7b7bb22b77389567f027bdf47
+  metadata.gz: 04ea180a321eb637807bc14bf657706a1cc66073043f41d915788fe74e8fe7590d80d1dfaddcbea24fe67639b10ff436638c5d6e21636183b93976e1589060a9
+  data.tar.gz: 92eac39422601a62401f9c2ff2386e1ce686194fce6ca67b88f9948bdddc0d60b001feba16a07cd503bad83ca0ebe1debb2253767243fc6dec6e500cb67226a7

data/CHANGELOG

@@ -1,3 +1,7 @@
+09-07-2015
+- Version 1.0.16
+- Fix: correct edge cases around keepalive checks on bus
+
 09-07-2015
 - Version 1.0.15
 - Feature: MessageBus.reliable_pub_sub.max_backlog_age (in secs) configurable (default to 7 days)

data/lib/message_bus/version.rb

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

data/lib/message_bus.rb

@@ -412,10 +412,16 @@ module MessageBus::Implementation
       end
     end
 
+    # adjust for possible race condition
+    @last_message = Time.now
+
     blk = proc do
-      if !@destroyed && thread.alive?
+      if !@destroyed && thread.alive? && keepalive_interval > MIN_KEEPALIVE
+
         publish("/__mb_keepalive__/", Process.pid, user_ids: [-1])
-        if (Time.now - (@last_message || Time.now)) > keepalive_interval*2
+        # going for x3 keepalives missed for a restart, need to ensure this only very rarely happens
+        # note: after_fork will sort out a bad @last_message date, but thread will be dead anyway
+        if (Time.now - (@last_message || Time.now)) > keepalive_interval*3
           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

metadata

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