Merge 8556d98 into 0c073d3

lib/msgr/binding.rb

@@ -4,17 +4,15 @@ class Binding
     include Logging
     attr_reader :connection, :route, :subscription, :dispatcher, :queue
 
-    def initialize(connection, route, dispatcher)
+    def initialize(connection, route, dispatcher, exchange)
       @connection = connection
       @route      = route
       @dispatcher = dispatcher
-
       exchange  = connection.exchange
       @queue    = connection.queue route.name
 
       route.keys.each do |key|
-        log(:debug) { "Bind #{key} to #{@queue.name}." }
-
+        log(:debug) { "Bind #{key} to #{@queue.name} on exchange #{exchange.name}." }
         queue.bind exchange, routing_key: key
       end
 

lib/msgr/client.rb

@@ -80,8 +80,8 @@ def stop(opts = {})
       log(:info) { 'Terminated.' }
     end
 
-    def publish(routing_key, payload)
-      @connection.publish payload, routing_key: routing_key
+    def publish(payload, routing_key)
+      @connection.publish payload, routing_key
     end
 
     private

lib/msgr/connection.rb

@@ -26,7 +26,7 @@ def rebind
 
     def bind
       # Create new bindings
-      routes.each { |route| bindings << Binding.new(Actor.current, route, dispatcher) }
+      routes.each { |route| bindings << Binding.new(Actor.current, route, dispatcher, exchange) }
 
       log(:debug) { 'New routes bound.' }
     end
@@ -101,6 +101,8 @@ def publish(payload, opts = {})
 
       begin
         payload = JSON.generate(payload)
+        log(:debug) {opts.inspect}
+        log(:debug) {exchange.name}
         exchange.publish payload, opts.merge(persistent: true, content_type: 'application/json')
       rescue => error
         exchange.publish payload.to_s, opts.merge(persistent: true, content_type: 'application/text')