legion-transport 0.1.0 → 1.0.0

data/lib/legion/transport/queue.rb

@@ -1,13 +1,70 @@
 module Legion
   module Transport
-    if RUBY_ENGINE == 'jruby'
-      require 'legion/transport/queues/marchhare'
-      class Queue < Legion::Transport::Queues::Marchhare
+    class Queue < Legion::Transport::CONNECTOR::Queue
+      include Legion::Transport::Common
+
+      def initialize(queue = queue_name, options = {})
+        retries ||= 0
+        @options = options
+        super(channel, queue, options_builder(default_options, queue_options, options))
+      rescue ::Bunny::PreconditionFailed
+        retries.zero? ? retries = 1 : raise
+        recreate_queue(channel, queue)
+        retry
       end
-    else
-      require 'legion/transport/queues/bunny'
-      class Queue < Legion::Transport::Queues::Bunny
+
+      def recreate_queue(channel, queue)
+        Legion::Logging.warn "Queue:#{queue} exists with wrong parameters, deleting and creating"
+        queue = ::Bunny::Queue.new(channel, queue, no_declare: true, passive: true)
+        queue.delete(if_empty: true)
+      end
+
+      def default_options
+        hash = {}
+        hash[:manual_ack] = true
+        hash[:durable] = true
+        hash[:exclusive] = false
+        hash[:block] = false
+        hash[:auto_delete] = false
+        hash[:arguments] = { 'x-max-priority': 255,
+                             'x-overflow': 'reject-publish',
+                             'x-dead-letter-exchange': "#{self.class.ancestors.first.to_s.split('::')[2].downcase}.dlx" }
+        hash
+      end
+
+      def queue_options
+        {}
+      end
+
+      def queue_name
+        ancestor = self.class.ancestors.first.to_s.split('::')
+        name = if ancestor[5].scan(/[A-Z]/).length > 1
+                 ancestor[5].gsub!(/(.)([A-Z])/, '\1_\2').downcase!
+               else
+                 ancestor[5].downcase!
+               end
+        "#{ancestor[2].downcase}.#{name}"
+      end
+
+      def delete(options = { if_unused: true, if_empty: true })
+        super(options)
+        true
+      rescue ::Bunny::PreconditionFailed
+        false
+      end
+
+      def acknowledge(delivery_tag)
+        channel.acknowledge(delivery_tag)
+      end
+
+      def reject(delivery_tag, requeue = false)
+        channel.reject(delivery_tag, requeue)
       end
     end
   end
 end
+
+require_relative 'queues/node'
+require_relative 'queues/node_status'
+require_relative 'queues/task_log'
+require_relative 'queues/task_update'

data/lib/legion/transport/queues/node.rb

@@ -0,0 +1,15 @@
+module Legion
+  module Transport
+    module Queues
+      class Node < Legion::Transport::Queue
+        def queue_name
+          "node.#{Legion::Settings['client']['name']}"
+        end
+
+        def queue_options
+          { durable: false, auto_delete: true, arguments: { 'x-dead-letter-exchange': 'node.dlx' } }
+        end
+      end
+    end
+  end
+end

data/lib/legion/transport/queues/node_status.rb

@@ -12,7 +12,7 @@ module Legion
           hash[:durable] = true
           hash[:exclusive] = false
           hash[:block] = false
-          hash[:arguments] = {}
+          hash[:arguments] = { 'x-dead-letter-exchange': 'node.dlx' }
           hash
         end
       end

data/lib/legion/transport/queues/task_log.rb

@@ -12,7 +12,7 @@ module Legion
           hash[:durable] = true
           hash[:exclusive] = false
           hash[:block] = false
-          hash[:arguments] = { 'x-max-priority': 255 }
+          hash[:arguments] = { 'x-max-priority': 255, 'x-dead-letter-exchange': 'task.dlx' }
           hash
         end
       end

data/lib/legion/transport/queues/task_update.rb

@@ -12,7 +12,7 @@ module Legion
           hash[:durable] = true
           hash[:exclusive] = false
           hash[:block] = false
-          hash[:arguments] = { 'x-max-priority': 252, 'x-dead-letter-exchange': 'task.dlx' }
+          hash[:arguments] = { 'x-dead-letter-exchange': 'task.dlx' }
           hash
         end
       end

data/lib/legion/transport/settings.rb

@@ -0,0 +1,64 @@
+module Legion
+  module Transport
+    module Settings
+      # Legion::Settings.merge_settings('transport', default) if Legion::Settings.method_defined? :merge_settings
+      def self.connection
+        {
+          read_timeout: 1,
+          heartbeat: 1,
+          automatically_recover: true,
+          continuation_timeout: 4000,
+          network_recovery_interval: 1,
+          connection_timeout: 1,
+          user: 'guest',
+          password: 'guest',
+          host: '127.0.0.1',
+          port: '5672',
+          vhost: 'legion',
+          recovery_attempts: 0,
+          logger_level: 'info'
+        }.merge(grab_vault_creds)
+      end
+
+      def self.grab_vault_creds
+        {} unless Legion::Settings[:vault][:connected]
+        lease = Legion::Crypt.read('rabbitmq/creds/legion')
+        { user: lease[:username], password: lease[:password] }
+      rescue StandardError
+        {}
+      end
+
+      def self.default
+        {
+          type: 'rabbitmq',
+          connected: false,
+          logger_level: 'info',
+          messages: {
+            encrypt: false,
+            ttl: nil,
+            priority: 0
+          },
+          exchanges: {
+            type: 'topic',
+            arguments: {},
+            auto_delete: false,
+            durable: true,
+            internal: false
+          },
+          queues: {
+            manual_ack: true,
+            durable: true,
+            exclusive: false,
+            block: false,
+            auto_delete: false,
+            arguments: { 'x-max-priority': 255, 'x-overflow': 'reject-publish' }
+          },
+          prefetch: 2,
+          connection: connection
+        }
+      end
+    end
+  end
+end
+
+Legion::Settings.merge_settings('transport', Legion::Transport::Settings.default) if Legion.const_defined?('Settings')

data/lib/legion/transport/version.rb

@@ -1,5 +1,5 @@
 module Legion
   module Transport
-    VERSION = '0.1.0'.freeze
+    VERSION = '1.0.0'.freeze
   end
 end

data/settings/transport.json

@@ -1 +1,9 @@
-{}
+{"transport": {
+  "rabbitmq": {
+    "host": "localhost",
+    "vhost": "legion",
+    "user": "guest",
+    "password": "guest"
+  }
+}
+}

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: legion-transport
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Esity
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-08 00:00:00.000000000 Z
+date: 2020-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: codecov
   requirement: !ruby/object:Gem::Requirement
@@ -94,20 +94,62 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby-ext
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: legion-settings
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bunny
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +168,16 @@ dependencies:
   name: legion-logging
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 description: The Legion transport gem
 email:
 - matthewdiverson@gmail.com
@@ -145,8 +187,17 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
+- ".idea/.rakeTasks"
+- ".idea/legion-transport.iml"
+- ".idea/misc.xml"
+- ".idea/modules.xml"
+- ".idea/vagrant.xml"
+- ".idea/workspace.xml"
+- ".rspec"
 - ".rubocop.yml"
+- CHANGELOG.md
 - Gemfile
+- README.md
 - Rakefile
 - bin/console
 - bin/setup
@@ -155,38 +206,36 @@ files:
 - lib/legion/transport.rb
 - lib/legion/transport/common.rb
 - lib/legion/transport/connection.rb
-- lib/legion/transport/connections/bunny.rb
-- lib/legion/transport/connections/common.rb
-- lib/legion/transport/connections/marchhare.rb
 - lib/legion/transport/consumer.rb
-- lib/legion/transport/consumers/bunny.rb
-- lib/legion/transport/consumers/common.rb
-- lib/legion/transport/consumers/marchhare.rb
 - lib/legion/transport/exchange.rb
-- lib/legion/transport/exchanges/bunny.rb
-- lib/legion/transport/exchanges/common.rb
+- lib/legion/transport/exchanges/crypt.rb
 - lib/legion/transport/exchanges/lex.rb
-- lib/legion/transport/exchanges/marchhare.rb
+- lib/legion/transport/exchanges/node.rb
 - lib/legion/transport/exchanges/task.rb
 - lib/legion/transport/message.rb
-- lib/legion/transport/messages/base.rb
+- lib/legion/transport/messages/check_subtask.rb
+- lib/legion/transport/messages/dynamic.rb
 - lib/legion/transport/messages/lex_register.rb
-- lib/legion/transport/messages/node_status.rb
-- lib/legion/transport/messages/task_check_subtask.rb
-- lib/legion/transport/messages/task_subtask.rb
+- lib/legion/transport/messages/node_health.rb
+- lib/legion/transport/messages/request_cluster_secret.rb
+- lib/legion/transport/messages/subtask.rb
+- lib/legion/transport/messages/task_log.rb
 - lib/legion/transport/messages/task_update.rb
 - lib/legion/transport/queue.rb
-- lib/legion/transport/queues/bunny.rb
-- lib/legion/transport/queues/common.rb
-- lib/legion/transport/queues/marchhare.rb
+- lib/legion/transport/queues/node.rb
 - lib/legion/transport/queues/node_status.rb
 - lib/legion/transport/queues/task_log.rb
 - lib/legion/transport/queues/task_update.rb
+- lib/legion/transport/settings.rb
 - lib/legion/transport/version.rb
 - settings/transport.json
 homepage: https://bitbucket.org/legion-io/legion-transport
 licenses: []
-metadata: {}
+metadata:
+  bug_tracker_uri: https://legionio.atlassian.net/projects/TRANSPORT/issues
+  changelog_uri: https://bitbucket.org/legion-io/legion-transport/src/master/CHANGELOG.md
+  homepage_uri: https://bitbucket.org/legion-io/legion-transport
+  wiki_uri: https://bitbucket.org/legion-io/legion-transport/wiki/Home
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -202,8 +251,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Used by Legion to connect with RabbitMQ

data/lib/legion/transport/connections/bunny.rb

@@ -1,53 +0,0 @@
-require 'legion/transport/connections/common'
-
-module Legion
-  module Transport
-    module Connections
-      module Bunny
-        @@session = nil # rubocop:disable Style/ClassVars
-        include Legion::Transport::Connections::Common
-        attr_accessor :session, :channel
-
-        def initialize(options = {})
-          options = options_builder(options)
-          create_session(options)
-          @channel = @session.create_channel
-          Legion::Settings[:transport][:rabbitmq][:connected] = true
-        end
-
-        def create_session(options = {})
-          Legion::Logging.debug 'Creating Legion::Transport session'
-          if options[:create_new_session]
-            @session = ::Bunny.new(options)
-            @session.start
-          elsif @@session.nil? || @@session.closed?
-            @@session = ::Bunny.new(options) # rubocop:disable Style/ClassVars
-            @@session.start
-            @session = @@session
-          else
-            Legion::Logging.debug "Using session:#{@@session.channel_id_allocator} from @@session"
-            @session = @@session
-          end
-        rescue NameError
-          Legion::Logging.debug 'Legion::Transport::Connection doesn\'t have a class variable session'
-          @session = ::Bunny.new(options)
-          @session.start
-        end
-
-        def valid_session?(session = @session)
-          false if session.nil? || session.empty?
-          false unless session.is_a? Bunny::Session
-          false if session.closed?
-          true
-        end
-
-        def valid_channel?(channel = @channel)
-          false if channel.nil? || session.empty?
-          false unless channel.is_a? Bunny::Session
-          false if channel.closed?
-          true
-        end
-      end
-    end
-  end
-end