legion-transport 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aca9d21a2d161f0838dc16ce328d81c3ba42360a777c63e6aa805f6c52502e13
-  data.tar.gz: 46af9353894537c81d73a68e01522498181d6d2fb54ae3fcdec465ebb75f8675
+  metadata.gz: a14303eeb59f5d328dba4782a6fcab96087a63403fa7e734fa98738c6010fccd
+  data.tar.gz: 3c30d91267de37a9f04e721755dd5452a9dcb8c6ff649c9a17ce0b941893be5d
 SHA512:
-  metadata.gz: add6818532d2159f4fa2be2a40148694f24511f7ca5095ad4477c9e0b72d70c546b2c7ba7ce6b60b44fa9b538c64e08d032dede1f341bbcb6e1831f541828d0e
-  data.tar.gz: 754b708ce889ff36ab763f4f72887895195721a9f5e43bea168e802ad6cde0e3fc813ef9ed7ac2e11d677388777d264fc635b57912376f96dff1b03d71108ce3
+  metadata.gz: b4e78c019c6ae475aa18cb82108c024d9df78f84d46073cdfcbbffafc2b1ac393e255052f4036a3311f652f01269aa1cfe7e636b6153c30b0c32cf11825e4622
+  data.tar.gz: f42031b318d1e491fff023496c379c323e8ec81aebe750d0291b8bdf0b6c1f361fd99b0d60804ba0814023b560f2e6ca3c76c00e845472cbf60ba54a9fbdc97e

data/lib/legion/transport.rb

@@ -3,11 +3,11 @@ require_relative 'transport/settings'
 
 module Legion
   module Transport
-    if RUBY_ENGINE == 'jruby' && defined?(::Marchhare)
-      require 'marchhare'
-      TYPE = 'marchhare'.freeze
-      CONNECTOR = ::Marchhare
-    else
+    begin
+      require 'march_hare'
+      TYPE = 'march_hare'.freeze
+      CONNECTOR = ::MarchHare
+    rescue LoadError
       require 'bunny'
       TYPE = 'bunny'.freeze
       CONNECTOR = ::Bunny
@@ -17,6 +17,5 @@ module Legion
   require_relative 'transport/common'
   require_relative 'transport/queue'
   require_relative 'transport/exchange'
-  require_relative 'transport/consumer'
   require_relative 'transport/message'
 end

data/lib/legion/transport/connection.rb

@@ -8,11 +8,24 @@ module Legion
           Legion::Transport::CONNECTOR
         end
 
-        def setup # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
+        def setup # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity,Metrics/MethodLength
+          Legion::Logging.info("Using transport connector: #{Legion::Transport::CONNECTOR}")
+
           if @session.respond_to?(:value) && session.respond_to?(:closed?) && session.closed?
-            @channel_thread = Concurrent::ThreadLocalVar.new
+            @channel_thread = Concurrent::ThreadLocalVar.new(nil)
           elsif @session.respond_to?(:value) && session.respond_to?(:closed?) && session.open?
-            return nil
+            nil
+          elsif Legion::Transport::TYPE == 'march_hare'
+            @session ||= Concurrent::Atom.new(
+              MarchHare.connect(host: Legion::Settings[:transport][:connection][:host],
+                                vhost: Legion::Settings[:transport][:connection][:vhost],
+                                user: Legion::Settings[:transport][:connection][:user],
+                                password: Legion::Settings[:transport][:connection][:password],
+                                port: Legion::Settings[:transport][:connection][:port])
+            )
+            @channel_thread = Concurrent::ThreadLocalVar.new(nil)
+            session.start
+            session.create_channel.basic_qos(1)
           else
             @session ||= Concurrent::Atom.new(
               connector.new(
@@ -21,18 +34,35 @@ module Legion
                 log_level: :info
               )
             )
-            @channel_thread = Concurrent::ThreadLocalVar.new
+            @channel_thread = Concurrent::ThreadLocalVar.new(nil)
+            session.start
+            session.create_channel.basic_qos(20, true)
           end
 
-          session.start
-          session.create_channel.basic_qos(1, true)
+          if session.respond_to? :on_blocked
+            session.on_blocked { Legion::Logging.warn('Legion::Transport is being blocked by RabbitMQ!') }
+          end
+
+          if session.respond_to? :on_unblocked
+            session.on_unblocked { Legion::Logging.info('Legion::Transport is no longer being blocked by RabbitMQ') }
+          end
+
+          if session.respond_to? :after_recovery_completed
+            session.after_recovery_completed { Legion::Logging.info('Legion::Transport has completed recovery') }
+          end
+
+          true
         end
 
-        def channel
+        def channel # rubocop:disable Metrics/AbcSize
           return @channel_thread.value if !@channel_thread.value.nil? && @channel_thread.value.open?
 
           @channel_thread.value = session.create_channel
-          @channel_thread.value.prefetch(Legion::Settings[:transport][:prefetch])
+          if Legion::Transport::TYPE == 'march_hare'
+            @channel_thread.value.basic_qos(Legion::Settings[:transport][:prefetch])
+          else
+            @channel_thread.value.prefetch(Legion::Settings[:transport][:prefetch])
+          end
           @channel_thread.value
         end
 

data/lib/legion/transport/exchange.rb

@@ -6,8 +6,14 @@ module Legion
       def initialize(exchange = exchange_name, options = {})
         @options = options
         @type = options[:type] || default_type
-        super(channel, @type, exchange, options_builder(default_options, exchange_options, @options))
-      rescue ::Bunny::PreconditionFailed, ::Bunny::ChannelAlreadyClosed
+        if Legion::Transport::TYPE == 'march_hare'
+          super_options = options_builder(default_options, exchange_options, @options)
+          super_options[:type] = @type
+          super(channel, exchange, **super_options)
+        else
+          super(channel, @type, exchange, options_builder(default_options, exchange_options, @options))
+        end
+      rescue Legion::Transport::CONNECTOR::PreconditionFailed, Legion::Transport::CONNECTOR::ChannelAlreadyClosed
         raise unless @retries.nil?
 
         @retries = 1
@@ -39,7 +45,7 @@ module Legion
       def delete(options = {})
         super(options)
         true
-      rescue ::Bunny::PreconditionFailed
+      rescue Legion::Transport::CONNECTOR::PreconditionFailed
         false
       end
 

data/lib/legion/transport/message.rb

@@ -11,7 +11,9 @@ module Legion
       def publish(options = @options) # rubocop:disable Metrics/AbcSize,Metrics/CyclomaticComplexity,Metrics/PerceivedComplexity
         raise unless @valid
 
-        exchange_dest = exchange.respond_to?(:new) ? exchange.new : exchange
+        $exchanges = {} if $exchanges.nil?
+        $exchanges[exchange.to_s] = exchange.new unless $exchanges.key?(exchange.to_s)
+        exchange_dest = $exchanges[exchange.to_s]
         exchange_dest.publish(encode_message,
                               routing_key: routing_key || '',
                               content_type: options[:content_type] || content_type,
@@ -26,6 +28,10 @@ module Legion
         @options
       end
 
+      def routing_key
+        nil
+      end
+
       def encode_message
         message_payload = message
         message_payload = Legion::JSON.dump(message_payload) unless message_payload.is_a? String

data/lib/legion/transport/messages/subtask.rb

@@ -16,17 +16,6 @@ module Legion
           }
         end
 
-        def routing_key # rubocop:disable Metrics/AbcSize
-          if @options[:conditions].is_a?(String) && @options[:conditions].length > 2
-            'task.subtask.conditioner'
-          elsif @options[:transformation].is_a?(String) && @options[:transformation].length > 2
-            'task.subtask.transform'
-          elsif @options[:function_id].is_a? Integer
-            function = Legion::Data::Model::Function[@options[:function_id]]
-            "#{function.runner.extension.values[:exchange]}.#{function.runner.values[:queue]}.#{function.values[:name]}"
-          end
-        end
-
         def validate
           raise TypeError unless @options[:function].is_a? String
 

data/lib/legion/transport/queue.rb

@@ -7,7 +7,7 @@ module Legion
         retries ||= 0
         @options = options
         super(channel, queue, options_builder(default_options, queue_options, options))
-      rescue ::Bunny::PreconditionFailed
+      rescue Legion::Transport::CONNECTOR::PreconditionFailed
         retries.zero? ? retries = 1 : raise
         recreate_queue(channel, queue)
         retry
@@ -51,7 +51,7 @@ module Legion
       def delete(options = { if_unused: true, if_empty: true })
         super(options)
         true
-      rescue ::Bunny::PreconditionFailed
+      rescue Legion::Transport::CONNECTOR::PreconditionFailed
         false
       end
 

data/lib/legion/transport/settings.rb

@@ -16,7 +16,7 @@ module Legion
           password: 'guest',
           host: '127.0.0.1',
           port: '5672',
-          vhost: '/',
+          vhost: 'legion',
           recovery_attempts: 0,
           logger_level: 'info'
         }.merge(grab_vault_creds)

data/lib/legion/transport/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Transport
-    VERSION = '1.1.3'.freeze
+    VERSION = '1.1.4'.freeze
   end
 end

data/settings/transport.json

@@ -1,5 +1,5 @@
 {
   "transport": {
-    "vhost": "/"
+    "vhost": "legion"
   }
 }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: legion-transport
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - Esity
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-25 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler