Reuse amqp connection in mapper proxy if available.

ezmobius · Dec 22, 2010 · 5a80056 · 5a80056
1 parent 1136bca
commit 5a80056
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/nanite/agent.rb b/lib/nanite/agent.rb
@@ -243,7 +243,7 @@ def setup_heartbeat
     end
 
     def setup_mapper_proxy
-      @mapper_proxy = MapperProxy.new(identity, options)
+      @mapper_proxy = MapperProxy.new(identity, options.merge(:amqp => @amqp))
     end
 
     def advertise_services

diff --git a/lib/nanite/mapper_proxy.rb b/lib/nanite/mapper_proxy.rb
@@ -23,7 +23,7 @@ def initialize(id, opts)
       @options = opts || {}
       @identity = id
       @pending_requests = {}
-      @amqp = start_amqp(options)
+      @amqp = options[:amqp] || start_amqp(options)
       @serializer = Serializer.new(options[:format])
       @@instance = self
     end