eventbus 0.27 → 0.28

data/lib/eventbus/connectors/stomp.rb

@@ -6,8 +6,6 @@ require 'socket'
 require 'stomp'
 module StompConnectionDriver
 
-  @@StompConnector_Connection = nil
-
   def connection_driver_initialize
     
   end 
@@ -76,15 +74,15 @@ module StompConnectionDriver
     }
   
     # If we never opened one, or if it's closed and not reliable, then open a new connection.
-    if @@StompConnector_Connection.nil? || (@@StompConnector_Connection.closed? && ! @@StompConnector_Connction.reliable?)
+    if Thread.current[:stomp_connection].nil? || (Thread.current[:stomp_connection].closed? && ! Thread.current[:stomp_connection].reliable?)
       EventBus.logger.info("Connecting to STOMP with options: #{opts.to_s}")
-      @@StompConnector_Connection = Stomp::Client.new(opts)
+      Thread.current[:stomp_connection] = Stomp::Client.new(opts)
     end
     
     # I'm  not sure whether we should sleep here if the connection is closed?() but is reliable?()
     # Assuming that the connection will do the right thing and punting until I find out different.
     
-    return @@StompConnector_Connection
+    return Thread.current[:stomp_connection]
   
   end
 
@@ -125,7 +123,7 @@ module StompConnectionDriver
     # and only take blocks of one message rather than claiming large blocks. These assumptions should become
     # configurable at some point, but for now it's not really a concern.
 
-    client.subscribe(queue_name, {"activemq.prefetchSize" => 1, "activemq.exclusive" => false}) do |msg|
+    client.subscribe(queue_name, {"activemq.prefetchSize".to_sym => 1, :exclusive => "false"}) do |msg|
       yield msg.body
     end
     

data/lib/eventbus/message.rb

@@ -10,7 +10,7 @@ class Message
   
   attr_reader :data
   
-  def initialize(application_id)
+  def initialize(application_id = EventBus.application_id)
     
     raise "No application ID specified!" if application_id.nil?
     

data/lib/eventbus/service.rb

@@ -49,32 +49,34 @@ class Service
   def start ( opts = {} )
     
     max_workers = opts.delete(:max_workers) || 5
+    async_service = opts.delete(:async_service) || false
     
     opts[:system_queue] = @system_process
     opts[:global_process] = @global_process
     
     queue_name = Queue.calc_name(listen_queue, @application_id, EventBus.PROD_LEVEL, opts)
     
-    watch_queue(queue_name) do |message|
-
-      # The +2 stuff is because the main thread counts in the list, even though it's not a "worker" thread.
-      # What makes it worse is that, depending on the broker connector, watch_queue may also start a thread.
-      # With this implementation, that extra thread (e.g. with the stomp connector) would count in this.
-      # Bottom line is allow a little wiggle room with the :max_workers. Don't tighten down the threads too much 
-      # for now. 
-      while (Thread.list.length >= max_workers + 2) do
-        sleep 0.25
-      end
-      
-      Thread.new do
-        process_message_wrapper message 
+    # I tried to have a single connection dole out to a worker pool, but I was having
+    # weird issues which I think were due to race conditions on the broker connections. 
+    # Just spin off threads prior to starting connections so every thread has a private 
+    # connection.
+    
+    (1..max_workers).each do
+      Thread.new {
+        watch_queue(queue_name) do |message|
+          process_message_wrapper message 
+        end 
+      }
+    end    
+    
+    # If async_service is false, we'll
+    # just return and leave it up to the caller to not 
+    # exit too soon.
+    
+    unless async_service
+      loop do
+        sleep 6000
       end
-     
-    end 
-    
-    # Just sleep in the main thread. Nothing going on here anymore.
-    loop do
-      sleep 6000
     end
     
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventbus
 version: !ruby/object:Gem::Version
-  version: '0.27'
+  version: '0.28'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-13 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: amqp