message_bus 1.0.9 → 1.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fcb3053a5e28fd2c050064c43f0065c3b8ee7bf1
-  data.tar.gz: b766e21019d5f45e4a8083e9aab9b8e8fa3af947
+  metadata.gz: e399202ac9751b63a940cf2442247905bc3394c3
+  data.tar.gz: cca646b9e0cead6959171bccc487015983caae22
 SHA512:
-  metadata.gz: f4637d0abd63d7c955e1155923bf1e74c6abc8c2aeda6f8f2c8d480c7f76bbadbcaf5f602667b37a1c5618f06d2fe9c1295e270ef20bdbc9fec25f078301eb2c
-  data.tar.gz: 0f41d3a209691da9d2866530b20d73de6d99fc3aa87456fa6d79d6a5ebec363f1fc727963d77d63f393c7359efd75dde80fd544049a624ecae8ef1ab4ccb7388
+  metadata.gz: 0e8caed956222e13faabee6bb0d0b33552fd9d030d4dd481d39baf16a208f9073e1be6c43a9a38e193ba07e8d31ccc65073a97685ea5dc0f72c6dd4833ddd813
+  data.tar.gz: bd0253ae0cead17c8508e91fe9ea0bd6bf94f8cdd16ad8822aa914e8853e3cd141380aada6b6ac62e9c13f96622ebd062f2b5916845f23672a757cc279820b98

data/CHANGELOG

@@ -1,3 +1,9 @@
+01-05-2015
+- Version: 1.0.10
+- Feature: no longer depends on EventMachine (only used for Thin backend)
+- Feature: realiable pub sub will queue messages in memory if redis is readonly, configurable
+- Fix: if redis is flushed we will continue to deliver messages
+
 23-03-2015
 - Version 1.0.9
 - Fix: inherit off StandardError not Exception for all exceptions raised
@@ -67,6 +73,5 @@
 - Improve robustness under failure conditions
 
 30-09-2013
-
 - Fix failures in Ruby 1.9
 - Set up rack hijack by default in light of passengers new setting

data/Guardfile

@@ -1,7 +1,51 @@
-guard 'rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
-end
+# A sample Guardfile
+# More info at https://github.com/guard/guard#readme
+
+## Uncomment and set this to only include directories you want to watch
+directories %w(lib spec)
+
+## Uncomment to clear the screen before every task
+# clearing :on
+
+## Guard internally checks for changes in the Guardfile and exits.
+## If you want Guard to automatically start up again, run guard in a
+## shell loop, e.g.:
+##
+##  $ while bundle exec guard; do echo "Restarting Guard..."; done
+##
+## Note: if you are using the `directories` clause above and you are not
+## watching the project directory ('.'), then you will want to move
+## the Guardfile to a watched dir and symlink it back, e.g.
+#
+#  $ mkdir config
+#  $ mv Guardfile config/
+#  $ ln -s config/Guardfile .
+#
+# and, you'll have to watch "config/Guardfile" instead of "Guardfile"
+
+# Note: The cmd option is now required due to the increasing number of ways
+#       rspec may be run, below are examples of the most common uses.
+#  * bundler: 'bundle exec rspec'
+#  * bundler binstubs: 'bin/rspec'
+#  * spring: 'bin/rspec' (This will use spring if running and you have
+#                          installed the spring binstubs per the docs)
+#  * zeus: 'zeus rspec' (requires the server to be started separately)
+#  * 'just' rspec: 'rspec'
 
+guard :rspec, cmd: "bundle exec rspec" do
+  require "guard/rspec/dsl"
+  dsl = Guard::RSpec::Dsl.new(self)
 
+  # Feel free to open issues for suggestions and improvements
+
+  # RSpec files
+  rspec = dsl.rspec
+  watch(rspec.spec_helper) { rspec.spec_dir }
+  watch(rspec.spec_support) { rspec.spec_dir }
+  watch(rspec.spec_files)
+
+  # Ruby files
+  ruby = dsl.ruby
+  dsl.watch_spec_files_for(ruby.lib_files)
+
+end

data/README.md

@@ -54,7 +54,7 @@ end
 MessageBus.client_filter("/channel") do |user_id, message|
   # return message if client is allowed to see this message
   # allows you to inject server side filtering of messages based on arbitrary rules
-  # also allows you to override the message a client will see
+  # also allows you to override the message a clients will see
   # be sure to .dup the message if you wish to change it
 end
 
@@ -96,7 +96,6 @@ MessageBus.subscribe("/channel", function(data){
 
 ```
 
-
 ## Similar projects
 
 Faye - http://faye.jcoglan.com/

data/examples/bench/config.ru

@@ -1,4 +1,5 @@
 require 'message_bus'
+require 'stackprof'
 
 if defined?(PhusionPassenger)
     PhusionPassenger.on_event(:starting_worker_process) do |forked|
@@ -17,8 +18,14 @@ end
 # Rack::MiniProfiler.config.storage = Rack::MiniProfiler::MemoryStore
 
 # use Rack::MiniProfiler
+# StackProf.start(mode: :cpu)
+# Thread.new {
+#   sleep 10
+#   StackProf.stop
+#   File.write("test.prof",Marshal.dump(StackProf.results))
+# }
+
 MessageBus.long_polling_interval = 1000 * 2
-MessageBus.rack_hijack_enabled = true
-MessageBus.max_active_clients = 3
+MessageBus.max_active_clients = 10000
 use MessageBus::Rack::Middleware
 run lambda { |env| [200, {"Content-Type" => "text/html"}, ["Howdy"]]  }

data/examples/chat/chat.rb

@@ -24,13 +24,19 @@ class Chat < Sinatra::Base
   <head>
     <script src="/jquery-1.8.2.js"></script>
     <script src="/message-bus.js"></script>
+    <style>
+        #panel { position: fixed; bottom: 0; background-color: #FFFFFF; }
+        #messages { padding-bottom: 40px; }
+        .hidden { display: none; }
+    </style>
   </head>
   <body>
-    <p>Chat Demo</p>
-    <div id='messages'></div>
-    <div id='panel'>
+    <p>This is a trivial chat demo... It is implemented as a <a href="https://github.com/SamSaffron/message_bus/blob/master/examples/chat/chat.rb">Sinatra app</a>. The <a href="https://github.com/SamSaffron/message_bus">message_bus</a> can easily be added to any Rails/Rack app. <small>This app can be deployed with <a href="https://github.com/discourse/discourse_docker">Discourse Docker</a> using <a href="https://github.com/SamSaffron/message_bus/blob/master/examples/chat/docker_container/chat.yml">this template</a>.</small></p>
+    <div id='messages' class="hidden"></div>
+    <div id='panel' class="hidden">
       <form>
         <textarea cols=80 rows=2></textarea>
+        <button id="send">send</button>
       </form>
     </div>
     <div id='your-name'>Enter your name: <input type='text'/>
@@ -39,26 +45,40 @@ class Chat < Sinatra::Base
       $(function() {
         var name;
 
-        $('#messages, #panel').hide();
+        $('#messages, #panel').addClass('hidden');
 
         $('#your-name input').keyup(function(e){
           if(e.keyCode == 13) {
             name = $(this).val();
-            $('#your-name').hide();
-            $('#messages, #panel').show();
+            $('#your-name').addClass('hidden');
+            $('#messages, #panel').removeClass('hidden');
+            $('#send').text("send (" + name + ")");
           }
         });
 
+        var safe = function(html){
+           return String(html).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+        };
 
         MessageBus.subscribe("/message", function(msg){
-          $('#messages').append("<p>"+ msg.name + " said: " + msg.data + "</p>");
+          $('#messages').append("<p>"+ safe(msg.name) + " said: " + safe(msg.data) + "</p>");
+          $(document.body).scrollTop(document.body.scrollHeight);
         }, 0); // last id is zero, so getting backlog
 
+        var submit = function(){
+          var val = $('form textarea').val().trim();
+          if (val.length === 0) {
+            return;
+          }
+          $.post("/message", { data: val, name: name} );
+          $('textarea').val("");
+        };
+
+        $('#send').click(function(){submit(); return false;});
 
         $('textarea').keyup(function(e){
           if(e.keyCode == 13) {
-            $.post("/message", { data: $('form textarea').val(), name: name} );
-            $('textarea').val("");
+            submit();
           }
         });
 

data/examples/chat/docker_container/chat.yml

@@ -0,0 +1,80 @@
+base_image: "samsaffron/discourse_base:1.0.11"
+
+update_pups: false
+
+params:
+  home: /var/www/message_bus
+
+templates:
+  - "templates/redis.template.yml"
+
+expose:
+  - "80:80"
+
+volumes:
+  - volume:
+     host: /var/docker/shared/chat
+     guest: /shared
+
+hooks:
+  after_redis:
+    - exec:
+        cmd:
+          - useradd chat -s /bin/bash -m -U
+    - exec:
+        background: true
+        cmd: "sudo -u redis /usr/bin/redis-server /etc/redis/redis.conf --dbfilename test.rdb"
+    - exec: mkdir -p /var/www
+    - exec: cd /var/www && git clone --depth 1 https://github.com/SamSaffron/message_bus.git
+    - exec:
+        cmd:
+          - gem install unicorn
+          - gem install redis
+          - gem install sinatra
+          - gem install eventmachine
+    - file:
+       path: /etc/service/unicorn/run
+       chmod: "+x"
+       contents: |
+         #!/bin/bash
+         exec 2>&1
+         # redis
+         cd $home/examples/chat
+         exec sudo -E -u chat LD_PRELOAD=/usr/lib/libjemalloc.so.1 unicorn -p 8080 -E production
+    - exec: rm /etc/nginx/sites-enabled/default
+    - replace:
+        filename: /etc/nginx/nginx.conf
+        from: pid /run/nginx.pid;
+        to: daemon off;
+    - file:
+        path: /etc/nginx/conf.d/chat.conf
+        contents: |
+          upstream chat {
+            server localhost:8080;
+          }
+          server {
+            listen 80;
+            gzip on;
+            gzip_types application/json text/css application/x-javascript;
+            gzip_min_length 1000;
+            server_name chat.samsaffron.com;
+            keepalive_timeout 65;
+            location / {
+              try_files $uri @chat;
+            }
+            location @chat{
+              proxy_set_header Host $http_host;
+              proxy_set_header X-Real-IP $remote_addr;
+              proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
+              proxy_set_header X-Forwarded-Proto http;
+              proxy_pass http://chat;
+            }
+          }
+    - file:
+       path: /etc/service/nginx/run
+       chmod: "+x"
+       contents: |
+          #!/bin/sh
+          exec 2>&1
+          exec /usr/sbin/nginx
+

data/examples/chat/docker_container/update_chat

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+result=`cd /root/logster && git pull | grep "Already up-to-date"`
+
+if [ -z "$result" ]; then
+   echo "updating..."
+   cd /var/docker && ./launcher bootstrap logster && ./launcher destroy logster && ./launcher start logster
+fi
+

data/lib/message_bus.rb

@@ -1,8 +1,5 @@
-# require 'thin'
-# require 'eventmachine'
-# require 'rack'
-# require 'redis'
-
+require "monitor"
+require "set"
 require "message_bus/version"
 require "message_bus/message"
 require "message_bus/reliable_pub_sub"
@@ -12,7 +9,6 @@ require "message_bus/message_handler"
 require "message_bus/diagnostics"
 require "message_bus/rack/middleware"
 require "message_bus/rack/diagnostics"
-require "monitor.rb"
 
 # we still need to take care of the logger
 if defined?(::Rails)
@@ -367,7 +363,11 @@ module MessageBus::Implementation
 
   def new_subscriber_thread
     Thread.new do
-      global_subscribe_thread unless @destroyed
+      begin
+        global_subscribe_thread unless @destroyed
+      rescue => e
+        MessageBus.logger.warn "Unexpected error in subscriber thread #{e}"
+      end
     end
   end
 

data/lib/message_bus/client.rb

@@ -99,15 +99,28 @@ class MessageBus::Client
 
   protected
 
+
+  # heavily optimised to avoid all uneeded allocations
+  NEWLINE="\r\n".freeze
+  COLON_SPACE = ": ".freeze
+  HTTP_11 = "HTTP/1.1 200 OK\r\n".freeze
+  CONTENT_LENGTH = "Content-Length: ".freeze
+  CONNECTION_CLOSE = "Connection: close\r\n".freeze
+
   def write_and_close(data)
     if @io
-      @io.write("HTTP/1.1 200 OK\r\n")
+      @io.write(HTTP_11)
       @headers.each do |k,v|
-        @io.write("#{k}: #{v}\r\n")
+        @io.write(k)
+        @io.write(COLON_SPACE)
+        @io.write(v)
+        @io.write(NEWLINE)
       end
-      @io.write("Content-Length: #{data.bytes.to_a.length}\r\n")
-      @io.write("Connection: close\r\n")
-      @io.write("\r\n")
+      @io.write(CONTENT_LENGTH)
+      @io.write(data.bytes.to_a.length)
+      @io.write(NEWLINE)
+      @io.write(CONNECTION_CLOSE)
+      @io.write(NEWLINE)
       @io.write(data)
       @io.close
       @io = nil

data/lib/message_bus/rack/middleware.rb

@@ -5,22 +5,33 @@ class MessageBus::Rack::Middleware
 
   def start_listener
     unless @started_listener
+      require 'message_bus/timer_thread'
 
-      require 'eventmachine'
-      require 'message_bus/em_ext'
+      @timer_thread = MessageBus::TimerThread.new
+      @timer_thread.on_error do |e|
+        @bus.logger.warn "Failed to process job: #{e} #{e.backtrace}"
+      end
+
+      thin = defined?(Thin::Server) && ObjectSpace.each_object(Thin::Server).to_a.first
+      thin_running = thin && thin.running?
 
       @subscription = @bus.subscribe do |msg|
-        if EM.reactor_running?
-          EM.next_tick do
-            begin
-              @connection_manager.notify_clients(msg) if @connection_manager
-            rescue
-              @bus.logger.warn "Failed to notify clients: #{$!} #{$!.backtrace}"
-            end
+        run = proc do
+          begin
+            @connection_manager.notify_clients(msg) if @connection_manager
+          rescue
+            @bus.logger.warn "Failed to notify clients: #{$!} #{$!.backtrace}"
           end
         end
+
+        if thin_running
+          EM.next_tick(&run)
+        else
+          @timer_thread.queue(&run)
+        end
+
+        @started_listener = true
       end
-      @started_listener = true
     end
   end
 
@@ -34,6 +45,7 @@ class MessageBus::Rack::Middleware
   def stop_listener
     if @subscription
       @bus.unsubscribe(&@subscription)
+      @timer_thread.stop if @timer_thread
       @started_listener = false
     end
   end
@@ -101,11 +113,8 @@ class MessageBus::Rack::Middleware
       return [200, headers, ["OK"]]
     end
 
-    ensure_reactor
-
     long_polling = @bus.long_polling_enabled? &&
                    env['QUERY_STRING'] !~ /dlp=t/.freeze &&
-                   EM.reactor_running? &&
                    @connection_manager.client_count < @bus.max_active_clients
 
     if backlog.length > 0
@@ -152,22 +161,10 @@ class MessageBus::Rack::Middleware
     end
   end
 
-  def ensure_reactor
-    # ensure reactor is running
-    if EM.reactor_pid != Process.pid
-      Thread.new { EM.run }
-      i = 100
-      while !EM.reactor_running? && i > 0
-        sleep 0.001
-        i -= 1
-      end
-    end
-  end
-
   def add_client_with_timeout(client)
     @connection_manager.add_client(client)
 
-    client.cleanup_timer = ::EM::Timer.new( @bus.long_polling_interval.to_f / 1000) {
+    client.cleanup_timer = @timer_thread.queue( @bus.long_polling_interval.to_f / 1000) {
       begin
         client.cleanup_timer = nil
         client.ensure_closed!

data/lib/message_bus/reliable_pub_sub.rb

@@ -10,6 +10,8 @@ require 'redis'
 
 class MessageBus::ReliablePubSub
   attr_reader :subscribed
+  attr_accessor :max_publish_retries, :max_publish_wait, :max_backlog_size,
+                :max_global_backlog_size, :max_in_memory_publish_backlog
 
   UNSUB_MESSAGE = "$$UNSUBSCRIBE"
 
@@ -22,38 +24,18 @@ class MessageBus::ReliablePubSub
     end
   end
 
-  def max_publish_retries=(val)
-    @max_publish_retries = val
-  end
-
-  def max_publish_retries
-    @max_publish_retries ||= 10
-  end
-
-  def max_publish_wait=(ms)
-    @max_publish_wait = ms
-  end
-
-  def max_publish_wait
-    @max_publish_wait ||= 500
-  end
-
   # max_backlog_size is per multiplexed channel
   def initialize(redis_config = {}, max_backlog_size = 1000)
     @redis_config = redis_config
     @max_backlog_size = 1000
-    # we can store a ton here ...
+    # we can store a lot of messages, since only one queue
     @max_global_backlog_size = 100000
-  end
-
-  # amount of global backlog we can spin through
-  def max_global_backlog_size=(val)
-    @max_global_backlog_size = val
-  end
-
-  # per channel backlog size
-  def max_backlog_size=(val)
-    @max_backlog_size = val
+    @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
   end
 
   def new_redis_connection
@@ -97,7 +79,7 @@ class MessageBus::ReliablePubSub
     end
   end
 
-  def publish(channel, data)
+  def publish(channel, data, queue_in_memory=true)
     redis = pub_redis
     backlog_id_key = backlog_id_key(channel)
     backlog_key = backlog_key(channel)
@@ -130,6 +112,65 @@ class MessageBus::ReliablePubSub
     end
 
     backlog_id
+
+  rescue Redis::CommandError => e
+    if queue_in_memory &&
+          e.message =~ /^READONLY/
+
+      @lock.synchronize do
+        @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")
+        end
+      end
+
+      if @flush_backlog_thread == nil
+        @lock.synchronize do
+          if @flush_backlog_thread == nil
+            @flush_backlog_thread = Thread.new{ensure_backlog_flushed}
+          end
+        end
+      end
+      nil
+    else
+      raise
+    end
+  end
+
+  def ensure_backlog_flushed
+    while true
+      try_again = false
+
+      @lock.synchronize do
+        break if @in_memory_backlog.length == 0
+
+        begin
+          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}")
+          end
+        rescue => e
+          MessageBus.logger.warn("Dropping undeliverable message #{e}")
+        end
+
+        @in_memory_backlog.delete_at(0) unless try_again
+      end
+
+      if try_again
+        sleep 0.005
+        # in case we are not connected to the correct server
+        # which can happen when sharing ips
+        pub_redis.client.reconnect
+      end
+    end
+  ensure
+    @lock.synchronize do
+      @flush_backlog_thread = nil
+    end
   end
 
   def last_id(channel)
@@ -197,6 +238,10 @@ class MessageBus::ReliablePubSub
   end
 
   def process_global_backlog(highest_id, raise_error, &blk)
+    if highest_id > pub_redis.get(global_id_key).to_i
+      highest_id = 0
+    end
+
     global_backlog(highest_id).each do |old|
       if highest_id + 1 == old.global_id
         yield old
@@ -209,6 +254,7 @@ class MessageBus::ReliablePubSub
         end
       end
     end
+
     highest_id
   end
 
@@ -263,10 +309,11 @@ class MessageBus::ReliablePubSub
           end
           m = MessageBus::Message.decode m
 
-          # we have 2 options
+          # we have 3 options
           #
           # 1. message came in the correct order GREAT, just deal with it
           # 2. message came in the incorrect order COMPLICATED, wait a tiny bit and clear backlog
+          # 3. message came in the incorrect order and is lowest than current highest id, reset
 
           if highest_id.nil? || m.global_id == highest_id + 1
             highest_id = m.global_id

data/lib/message_bus/timer_thread.rb

@@ -0,0 +1,87 @@
+class MessageBus::TimerThread
+
+  attr_reader :jobs
+
+  class Cancelable
+    NOOP = proc{}
+
+    def initialize(job)
+      @job = job
+    end
+    def cancel
+      @job[1] = NOOP
+    end
+  end
+
+  def initialize
+    @stopped = false
+    @jobs = []
+    @mutex = Mutex.new
+    @next = nil
+    @thread = Thread.new{do_work}
+    @on_error = lambda{|e| STDERR.puts "Exception while processing Timer:\n #{e.backtrace.join("\n")}"}
+  end
+
+  def stop
+    @stopped = true
+  end
+
+  # queue a block to run after a certain delay (in seconds)
+  def queue(delay=0, &block)
+    queue_time = Time.new.to_f + delay
+    job = [queue_time, block]
+
+    @mutex.synchronize do
+      i = @jobs.length
+      while i > 0
+        i -= 1
+        current,_ = @jobs[i]
+        i+=1 and break if current < queue_time
+      end
+      @jobs.insert(i, job)
+      @next = queue_time if i==0
+    end
+
+    unless @thread.alive?
+      @mutex.synchronize do
+        @thread = Thread.new{do_work} unless @thread.alive?
+      end
+    end
+
+    if @thread.status == "sleep".freeze
+      @thread.wakeup
+    end
+
+    Cancelable.new(job)
+  end
+
+  def on_error(&block)
+    @on_error = block
+  end
+
+  protected
+
+  def do_work
+    while !@stopped
+      if @next && @next <= Time.new.to_f
+        _,blk = @jobs.shift
+        begin
+          blk.call
+        rescue => e
+          @on_error.call(e) if @on_error
+        end
+        @mutex.synchronize do
+          @next,_ = @jobs[0]
+        end
+      end
+      unless @next && @next <= Time.new.to_f
+        sleep_time = 1000
+        @mutex.synchronize do
+          sleep_time = @next-Time.new.to_f if @next
+        end
+        sleep [0,sleep_time].max
+      end
+    end
+  end
+
+end

data/lib/message_bus/version.rb

@@ -1,3 +1,3 @@
 module MessageBus
-  VERSION = "1.0.9"
+  VERSION = "1.0.10"
 end

data/message_bus.gemspec

@@ -16,6 +16,5 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = MessageBus::VERSION
   gem.add_runtime_dependency 'rack', '>= 1.1.3'
-  gem.add_runtime_dependency 'eventmachine'
   gem.add_runtime_dependency 'redis'
 end

data/spec/lib/client_spec.rb

@@ -6,7 +6,13 @@ describe MessageBus::Client do
   describe "subscriptions" do
 
     before do
-      @client = MessageBus::Client.new :client_id => 'abc'
+      @bus = MessageBus::Instance.new
+      @client = MessageBus::Client.new client_id: 'abc', message_bus: @bus
+    end
+
+    after do
+      @bus.reset!
+      @bus.destroy
     end
 
     it "should provide a list of subscriptions" do
@@ -16,7 +22,7 @@ describe MessageBus::Client do
 
     it "should provide backlog for subscribed channel" do
       @client.subscribe('/hello', nil)
-      MessageBus.publish '/hello', 'world'
+      @bus.publish '/hello', 'world'
       log = @client.backlog
       log.length.should == 1
       log[0].channel.should == '/hello'

data/spec/lib/message_bus_spec.rb

@@ -18,6 +18,26 @@ describe MessageBus do
     @bus.destroy
   end
 
+  it "should recover from a redis flush" do
+
+    data = nil
+    @bus.subscribe("/chuck") do |msg|
+      data = msg.data
+    end
+    @bus.publish("/chuck", {:norris => true})
+    @bus.publish("/chuck", {:norris => true})
+    @bus.publish("/chuck", {:norris => true})
+
+    @bus.reliable_pub_sub.pub_redis.flushall
+
+    @bus.publish("/chuck", {:yeager => true})
+
+    wait_for(2000){ data["yeager"]}
+
+    data["yeager"].should == true
+
+  end
+
   it "should automatically decode hashed messages" do
     data = nil
     @bus.subscribe("/chuck") do |msg|
@@ -147,7 +167,9 @@ describe MessageBus do
     end
 
     @bus.publish("/hello", "world")
+
     wait_for(2000){ data }
+
     if child = Process.fork
       wait_for(2000) { data == "ready" }
       @bus.publish("/hello", "world1")
@@ -164,7 +186,10 @@ describe MessageBus do
 
       $stdout.reopen("/dev/null", "w")
       $stderr.reopen("/dev/null", "w")
-      exit
+     
+      # having some issues with exit here
+      # TODO find and fix
+      Process.kill "KILL", Process.pid
     end
 
   end

data/spec/lib/multi_process_spec.rb

@@ -8,8 +8,6 @@ describe MessageBus::ReliablePubSub do
   end
 
   def work_it
-    Signal.trap("HUP") { exit }
-
     bus = new_bus
     $stdout.reopen("/dev/null", "w")
     $stderr.reopen("/dev/null", "w")
@@ -29,7 +27,6 @@ describe MessageBus::ReliablePubSub do
   end
 
   it 'gets every response from child processes' do
-    pid = nil
     Redis.new(:db => 10).flushdb
     begin
       pids = (1..10).map{spawn_child}
@@ -51,7 +48,7 @@ describe MessageBus::ReliablePubSub do
     ensure
       if pids
         pids.each do |pid|
-          Process.kill("HUP", pid)
+          Process.kill("KILL", pid)
           Process.wait(pid)
         end
       end

data/spec/lib/reliable_pub_sub_spec.rb

@@ -12,6 +12,31 @@ describe MessageBus::ReliablePubSub do
     @bus.reset!
   end
 
+  context "readonly" do
+    before do
+      @bus.pub_redis.slaveof "127.0.0.80", "666"
+    end
+
+    after do
+      @bus.pub_redis.slaveof "no", "one"
+    end
+
+    it "should be able to store messages in memory for a period while in read only" do
+      @bus.max_in_memory_publish_backlog = 2
+
+      3.times do
+        result = @bus.publish "/foo", "bar"
+        result.should == nil
+      end
+
+      @bus.pub_redis.slaveof "no", "one"
+      sleep 0.01
+
+      @bus.backlog("/foo", 0).map(&:data).should == ["bar","bar"]
+
+    end
+  end
+
   it "should be able to access the backlog" do
     @bus.publish "/foo", "bar"
     @bus.publish "/foo", "baz"

data/spec/lib/timer_thread_spec.rb

@@ -0,0 +1,65 @@
+require 'spec_helper'
+require 'message_bus/timer_thread'
+
+describe MessageBus::TimerThread do
+  before do
+    @timer = MessageBus::TimerThread.new
+  end
+
+  after do
+    @timer.stop
+  end
+
+  it "allows you to cancel timers" do
+    success = true
+    @timer.queue(0.005){success=false}.cancel
+    sleep(0.006)
+    success.should == true
+  end
+
+  it "queues jobs in the correct order" do
+    counter = 0
+    failed = nil
+
+    items = (0..5).to_a.shuffle
+    items.map do |i|
+      # threading introduces a delay meaning we need to wait a long time
+      Thread.new do
+        @timer.queue(i/5.0) do
+          failed = true if counter != i
+          counter += 1
+        end
+      end
+    end
+
+    wait_for(1500) {
+      counter == items.length
+    }
+
+    counter.should == items.length
+    failed.should == nil
+  end
+
+  it "should call the error callback if something goes wrong" do
+    error = nil
+
+    @timer.queue do
+      boom
+    end
+
+    @timer.on_error do |e|
+      error = e
+    end
+
+    @timer.queue do
+      boom
+    end
+
+    wait_for(10) do
+      error
+    end
+
+    error.class.should == NameError
+  end
+
+end

data/spec/spec_helper.rb

@@ -8,6 +8,11 @@ RSpec.configure do |config|
   config.mock_with :rspec do |mocks|
     mocks.syntax = :should
   end
+
+  # to debug hanging tests
+  # config.before :each do |x|
+  #   p x.metadata[:location]
+  # end
 end
 
 def wait_for(timeout_milliseconds)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: message_bus
 version: !ruby/object:Gem::Version
-  version: 1.0.9
+  version: 1.0.10
 platform: ruby
 authors:
 - Sam Saffron
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-23 00:00:00.000000000 Z
+date: 2015-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -24,20 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.3
-- !ruby/object:Gem::Dependency
-  name: eventmachine
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: redis
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +66,8 @@ files:
 - examples/bench/unicorn.conf.rb
 - examples/chat/chat.rb
 - examples/chat/config.ru
+- examples/chat/docker_container/chat.yml
+- examples/chat/docker_container/update_chat
 - examples/minimal/Gemfile
 - examples/minimal/config.ru
 - lib/message_bus.rb
@@ -94,6 +82,7 @@ files:
 - lib/message_bus/rack/thin_ext.rb
 - lib/message_bus/rails/railtie.rb
 - lib/message_bus/reliable_pub_sub.rb
+- lib/message_bus/timer_thread.rb
 - lib/message_bus/version.rb
 - message_bus.gemspec
 - spec/lib/assets/asset_encoding_spec.rb
@@ -106,6 +95,7 @@ files:
 - spec/lib/middleware_spec.rb
 - spec/lib/multi_process_spec.rb
 - spec/lib/reliable_pub_sub_spec.rb
+- spec/lib/timer_thread_spec.rb
 - spec/spec_helper.rb
 - vendor/assets/javascripts/message-bus.js
 homepage: https://github.com/SamSaffron/message_bus
@@ -128,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: ''
@@ -143,4 +133,5 @@ test_files:
 - spec/lib/middleware_spec.rb
 - spec/lib/multi_process_spec.rb
 - spec/lib/reliable_pub_sub_spec.rb
+- spec/lib/timer_thread_spec.rb
 - spec/spec_helper.rb