omf_common 6.2.0.pre.1 → 6.2.0.pre.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmYzMTkzNjI2NTdjYmU1YTUwMWNkMGEzNmUyNTY2YTM3OTM1N2U1OQ==
+    YmU3MzM4YzI4ZDI3MmQ0OTIwZTk2NjYxYTcyMTkzNjkwYTJjOGJmZg==
   data.tar.gz: !binary |-
-    YTdiNGY4MTc3NjU5Y2ViYWVhZmNmY2EyZTRhYzY0YWY4NjcxMGQyYw==
+    OTBjZDRlMzMxZGZhNDdlN2M4YzQ1ZDExNjZhODQxOWE3MWIxZDM5OA==
 SHA512:
   metadata.gz: !binary |-
-    NjI5YjliODM3ZWQwM2ZjNTMwNjAxZGU0YTMwMWNmZjcwZjk4OGExNDdhZWU5
-    MDlkYWI0Mzg0ZjNiNDY2YjA1MjQzZTcwYzczZDg4YzFlNzI5MjM5YmE2NmJl
-    YzI5NzEzMzI5YjUwOWM3NjhiOGJlMjAxMzM2MWNjYjA0YzBiMzU=
+    N2RmM2VjNmU5MWNlMjI0ZjYzNTU2MzhhMWI4NzI5N2JlNjg2MzcwOWMxNTVi
+    YzdiMjJlMDM5YzBhYWY0YWMxYWE4Mzc4NDFlMTc0YTEwY2M1MDMyNDc4OWMz
+    ZjQzZmE0MWRlYjJjYWU4NWY1MzhkMGRiMDJlYmRiMThkYTY2MTg=
   data.tar.gz: !binary |-
-    OWFjYWI5NzE0OTIzM2U2YjBjYzhjYjg3MjVhMWM0MDY1ZGQyN2RkMGY0MWJk
-    YjU2NDViNmMxZDU3MTU1NTA0ODRlN2YyMDk0NWU5YjdjZGQ3NDFiMjRjNzMy
-    YjY4ZTZmOGZhNzM1ZWU1MTYwZWNhZWQzMjA1ZGNiMWE5ZTNlZGE=
+    Nzg4NDc4NzdmMWE0YTkwM2RlYWY4MzRlOWMxMmM1YmQ4Mjg5NWNjY2E1ZTUy
+    NTM0YmIyNzMzN2Q0M2M2Mzc2MWRhNDZjYjcwZmMzZmYwZjhlMTQ0ODVlY2Qy
+    MzEyODA5ZDllNjZkMGI4NzdiMzExY2UxYTc4NTMwMmVmZWFlYTQ=

data/lib/omf_common/comm.rb

@@ -151,7 +151,7 @@ module OmfCommon
     def subscribe(topic_name, opts = {}, &block)
       tna = (topic_name.is_a? Array) ? topic_name : [topic_name]
       ta = tna.collect do |tn|
-        t = create_topic(tn.to_s)
+        t = create_topic(tn.to_s, opts)
         if block
           t.on_subscribed do
             block.call(t)
@@ -162,20 +162,6 @@ module OmfCommon
       ta[0]
     end
 
-    # Publish a message on a topic
-    #
-    # @param [String, Array] topic_name Pubsub topic name
-    # @param [OmfCoomon::Message] message
-    #
-    def publish(topic_name, message)
-      #puts "PUBLISH>>>>> #{topic_name}::#{message}"
-      tna = (topic_name.is_a? Array) ? topic_name : [topic_name]
-      ta = tna.collect do |tn|
-        t = create_topic(tn)
-        t.publish(message)
-      end
-    end
-
     # Return the options used to initiate this
     # communicator.
     #

data/lib/omf_common/comm/amqp/amqp_topic.rb

@@ -49,6 +49,7 @@ module OmfCommon
           @lock = Monitor.new
           @subscribed = false
           @on_subscribed_handlers = []
+          @routing_key = opts[:routing_key]
 
           # @communicator.on_reconnect(self) do
             # info "Resubscribe '#{self}'"
@@ -66,10 +67,11 @@ module OmfCommon
           # end
           channel.queue("", :exclusive => true, :auto_delete => true) do |queue|
             #puts "QQ1(#{id}): #{queue}"
-            queue.bind(@exchange)
+            queue.bind(@exchange, routing_key: @routing_key)
+
             queue.subscribe do |headers, payload|
               #puts "===(#{id}) Incoming message '#{headers.content_type}'"
-              debug "Received message on #{@address}"
+              debug "Received message on #{@address} | #{@routing_key}"
               MPReceived.inject(Time.now.to_f, @address, payload.to_s[/mid\":\"(.{36})/, 1]) if OmfCommon::Measure.enabled?
               Message.parse(payload, headers.content_type) do |msg|
                 #puts "---(#{id}) Parsed message '#{msg}'"
@@ -88,12 +90,12 @@ module OmfCommon
           end
         end
 
-        def _send_message(msg, block = nil)
+        def _send_message(msg, opts = {}, block = nil)
           super
           content_type, content = msg.marshall(self)
-          debug "(#{id}) Send message (#{content_type}) #{msg.inspect}"
+          debug "(#{id}) Send message (#{content_type}) #{msg.inspect} TO #{opts[:routing_key]}"
           if @exchange
-            @exchange.publish(content, content_type: content_type, message_id: msg.mid)
+            @exchange.publish(content, content_type: content_type, message_id: msg.mid, routing_key: opts[:routing_key])
             MPPublished.inject(Time.now.to_f, @address, msg.mid) if OmfCommon::Measure.enabled?
           else
             warn "Unavailable AMQP channel. Dropping message '#{msg}'"

data/lib/omf_common/comm/topic.rb

@@ -19,11 +19,11 @@ module OmfCommon
         name = name.to_s.to_sym
         @@lock.synchronize do
           unless @@name2inst[name]
-            debug "New topic: #{name}"
+            debug "New topic: #{name} | #{opts[:routing_key]}"
             #opts[:address] ||= address_for(name)
             @@name2inst[name] = self.new(name, opts, &block)
           else
-            debug "Existing topic: #{name}"
+            debug "Existing topic: #{name} | #{@@name2inst[name].routing_key}"
             block.call(@@name2inst[name]) if block
           end
           @@name2inst[name]
@@ -34,7 +34,7 @@ module OmfCommon
         @@name2inst[name]
       end
 
-      attr_reader :id
+      attr_reader :id, :routing_key
 
       # Request the creation of a new resource. Returns itself
       #
@@ -59,7 +59,7 @@ module OmfCommon
       def inform(type, props = {}, core_props = {}, &block)
         core_props[:src] ||= OmfCommon.comm.local_address
         msg = OmfCommon::Message.create(:inform, props, core_props.merge(itype: type))
-        publish(msg, &block)
+        publish(msg, { routing_key: "o.info" }, &block)
         self
       end
 
@@ -69,20 +69,23 @@ module OmfCommon
         end
         core_props[:src] ||= OmfCommon.comm.local_address
         msg = OmfCommon::Message.create(:release, {}, core_props.merge(res_id: resource.id))
-        publish(msg, &block)
+        publish(msg, { routing_key: "o.op" }, &block)
         self
       end
 
+      # Only used for create, configure and request
       def create_message_and_publish(type, props = {}, core_props = {}, block = nil)
         debug "(#{id}) create_message_and_publish '#{type}': #{props.inspect}: #{core_props.inspect}"
         core_props[:src] ||= OmfCommon.comm.local_address
         msg = OmfCommon::Message.create(type, props, core_props)
-        publish(msg, &block)
+        publish(msg, { routing_key: "o.op" }, &block)
       end
 
-      def publish(msg, &block)
+      def publish(msg, opts = {}, &block)
+        error "!!!" if opts[:routing_key].nil?
+
         raise "Expected message but got '#{msg.class}" unless msg.is_a?(OmfCommon::Message)
-        _send_message(msg, block)
+        _send_message(msg, opts, block)
       end
 
       # TODO we should fix this long list related to INFORM messages
@@ -154,7 +157,7 @@ module OmfCommon
 
       # _send_message will also register callbacks for reply messages by default
       #
-      def _send_message(msg, block = nil)
+      def _send_message(msg, opts = {}, block = nil)
         if (block)
           # register callback for responses to 'mid'
           debug "(#{id}) register callback for responses to 'mid: #{msg.mid}'"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: omf_common
 version: !ruby/object:Gem::Version
-  version: 6.2.0.pre.1
+  version: 6.2.0.pre.2
 platform: ruby
 authors:
 - NICTA