updatebroker 0.0.7 → 0.0.8

data/lib/updatebroker/updatebroker.rb

@@ -1,5 +1,5 @@
 #
-# (c) 2011 Sourdough Labs Research and Development Corp
+# (c) 2011, 2012 Sourdough Labs Research and Development Corp
 #
 
 require 'rubygems'
@@ -12,26 +12,51 @@ class UpdateBroker < Goliath::API
 
   attr_accessor :redis
 
+  def initialize(opts = {})
+    @channels = {}
+  end
+
+  def add_channel_handler(channel, handler)
+    handlers = @channels[channel] || []
+    handlers << handler
+    @channels[channel] = handlers
+  end
+
+  # Don't call unless add_channel_stream has been called at least once for the given channel
+  def remove_channel_handler(channel, handler)
+    handlers = @channels[channel]
+    handlers.delete(handler) unless handlers.nil?
+  end
+
+  def send_message_to_handlers(channel, msg)   
+    handlers = @channels[channel]
+    unless handlers.nil?
+      handlers.each do |e|
+        res = e.stream_send("data:#{msg}\n\n")
+      end
+    end
+  end
+
   def response(env)
     path = env[Goliath::Request::REQUEST_PATH]
-    env.logger.info "Request for '#{path}'"
     return [404, {}, "Not found"] unless path == "/events"
 
     channel = env.params[:channel] || env.params['channel']
-    env.logger.info "On channel '#{channel}'"
     return [404, {}, "Channel required"] if channel.nil? || channel == ""
 
-    env.logger.info "Connecting to channel '#{channel}'@#{options[:redis]} for updates"
-
-    env['redis'] = EM::Hiredis.connect(options[:redis])
-    env['redis'].subscribe(channel)
-    env['redis'].on(:message) do |chn, msg|
-      env.logger.info "Message received from channel #{chn}: #{msg} (We're looking for #{channel})"
-      if chn === channel
-        res = env.stream_send("data:#{msg}\n\n")
+    if self.redis.nil?
+      env.logger.info "Redis connection is down, Connecting to @#{options[:redis]}"
+      self.redis = EM::Hiredis.connect(options[:redis]) 
+      redis.on(:message) do |chn, msg|
+        env.logger.info "Message for channel '#{chn}':"        
+        send_message_to_handlers(chn,msg) 
       end
     end
 
+    env.logger.info "subscribing to channel '#{channel}' for updates"
+    redis.subscribe(channel)
+    add_channel_handler(channel, env)
+
     streaming_response(200, {'Content-Type' => 'text/event-stream'})
   end
 
@@ -43,11 +68,8 @@ class UpdateBroker < Goliath::API
     return if channel.nil? || channel == ""
 
     env.logger.info "Connection closed, Unsubscribing."
-    unless env['redis'].nil?
-      env['redis'].unsubscribe(channel)
-      env['redis'].quit
-      env['redis'].close_connection
-    end
+    redis.unsubscribe(channel)
+    remove_channel_handler(channel, env)
   end
 
   def options_parser(opts, options)

data/lib/updatebroker/version.rb

@@ -1,3 +1,3 @@
 module Updatebroker
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: updatebroker
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-30 00:00:00.000000000 Z
+date: 2012-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hiredis