fleck 2.2.1 → 2.2.3

data/lib/fleck/core/consumer/logger.rb

@@ -1,88 +1,88 @@
-# frozen_string_literal: true
-
-module Fleck
-  module Core
-    class Consumer
-      module Logger
-        def self.included(base)
-          base.extend ClassMethods
-          base.send :include, InstanceMethods
-        end
-
-        # Defines class methods to import when `Logger` module is imported.
-        module ClassMethods
-          attr_accessor :logger
-        end
-
-        # Defines instance methods to import when `Logger` module is imported.
-        module InstanceMethods
-          def logger
-            return @logger if @logger
-
-            @logger = self.class.logger.clone
-            @logger.progname = self.class.name.to_s + (configs[:concurrency].to_i <= 1 ? '' : "[#{consumer_id}]")
-
-            @logger
-          end
-
-          private
-
-          def log_request
-            status = final_response_status
-            message = log_formatted_message
-
-            if status >= 500
-              logger.error message
-            elsif status >= 400 || response.deprecated?
-              logger.warn message
-            else
-              logger.info message
-            end
-          end
-
-          def exchange_type_code
-            rmq_exchange_type.to_s[0].upcase
-          end
-
-          def final_response_status
-            return 406 if request.rejected?
-            return 503 if channel.closed?
-
-            response.status
-          end
-
-          def log_formatted_message
-            [
-              request_origin,
-              exchange_and_queue_name,
-              request_metadata,
-              request_execution_time,
-              deprecation_message
-            ].join
-          end
-
-          def request_origin
-            "#{request.ip} #{request.app_id} => "
-          end
-
-          def exchange_and_queue_name
-            ex_name = rmq_exchange_name.to_s == '' ? ''.inspect : rmq_exchange_name
-            "(#{ex_name}|#{exchange_type_code}|#{queue_name}) "
-          end
-
-          def request_metadata
-            "##{request.id} \"#{request.action} /#{request.version || 'v1'}\" #{final_response_status} "
-          end
-
-          def request_execution_time
-            "(#{request.execution_time}ms)"
-          end
-
-          def deprecation_message
-            response.deprecated? ? ' DEPRECATED' : ''
-          end
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Fleck
+  module Core
+    class Consumer
+      module Logger
+        def self.included(base)
+          base.extend ClassMethods
+          base.send :include, InstanceMethods
+        end
+
+        # Defines class methods to import when `Logger` module is imported.
+        module ClassMethods
+          attr_accessor :logger
+        end
+
+        # Defines instance methods to import when `Logger` module is imported.
+        module InstanceMethods
+          def logger
+            return @logger if @logger
+
+            @logger = self.class.logger.clone
+            @logger.progname = self.class.name.to_s + (configs[:concurrency].to_i <= 1 ? '' : "[#{consumer_id}]")
+
+            @logger
+          end
+
+          private
+
+          def log_request
+            status = final_response_status
+            message = log_formatted_message
+
+            if status >= 500
+              logger.error message
+            elsif status >= 400 || response.deprecated?
+              logger.warn message
+            else
+              logger.info message
+            end
+          end
+
+          def exchange_type_code
+            rmq_exchange_type.to_s[0].upcase
+          end
+
+          def final_response_status
+            return 406 if request.rejected?
+            return 503 if channel.closed?
+
+            response.status
+          end
+
+          def log_formatted_message
+            [
+              request_origin,
+              exchange_and_queue_name,
+              request_metadata,
+              request_execution_time,
+              deprecation_message
+            ].join
+          end
+
+          def request_origin
+            "#{request.ip} #{request.app_id} => "
+          end
+
+          def exchange_and_queue_name
+            ex_name = rmq_exchange_name.to_s == '' ? ''.inspect : rmq_exchange_name
+            "(#{ex_name}|#{exchange_type_code}|#{queue_name}) "
+          end
+
+          def request_metadata
+            "##{request.id} \"#{request.action} /#{request.version || 'v1'}\" #{final_response_status} "
+          end
+
+          def request_execution_time
+            "(#{request.execution_time}ms)"
+          end
+
+          def deprecation_message
+            response.deprecated? ? ' DEPRECATED' : ''
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fleck/core/consumer/request.rb

@@ -1,100 +1,100 @@
-# frozen_string_literal: true
-
-module Fleck
-  module Core
-    class Consumer
-      class Request
-        include Fleck::Loggable
-
-        attr_reader :id, :response, :metadata, :payload, :action, :data, :headers, :version, :ip, :params, :status, :errors,
-                    :delivery_tag, :app_id, :reply_to, :created_at, :processed_at
-
-        def initialize(metadata, payload, delivery_info)
-          @created_at      = Time.now
-          @id              = metadata.correlation_id
-          logger.progname += " #{@id}"
-
-          @response      = Fleck::Core::Consumer::Response.new(metadata.correlation_id)
-          @metadata      = metadata
-          @app_id        = metadata[:app_id]
-          @reply_to      = @metadata.reply_to
-          @payload       = payload
-          @exchange      = delivery_info.exchange
-          @queue         = delivery_info.routing_key
-          @delivery_tag  = delivery_info.delivery_tag
-          @data          = {}
-          @headers       = (@metadata.headers || {}).to_hash_with_indifferent_access
-          @action        = @metadata.type
-          @version       = nil
-          @ip            = nil
-          @params        = {}
-          @failed        = false
-          @rejected      = false
-          @requeue       = false
-
-          parse_request!
-        end
-
-        def processed!
-          @processed_at = Time.now
-        end
-
-        def execution_time
-          ((@processed_at.to_f - @created_at.to_f) * 1000).round(2)
-        end
-
-        def failed?
-          @failed
-        end
-
-        def reject!(requeue: false)
-          @rejected = true
-          @requeue  = requeue
-          processed!
-        end
-
-        def rejected?
-          @rejected
-        end
-
-        def requeue?
-          @requeue
-        end
-
-        def log_headers_and_params!
-          queue_name = "(#{@exchange == '' ? @queue : "#{@queue}@#{@exchange}"})".color(:red)
-          endpoint = "/#{action} :#{@version || 'v1'}".color(:red)
-          message = "\n" \
-                    "#{ip} - #{queue_name} #{endpoint} [#{@id}]\n" \
-                    "  ~ headers ~ #{headers.inspect.color(:green)}\n" \
-                    "  @params #{params.inspect.color(:green)}"
-          logger.debug message
-        end
-
-        protected
-
-        def parse_request!
-          @data = Oj.load(@payload, mode: :compat).to_hash_with_indifferent_access.filtered!
-          @headers.merge!(@data['headers'] || {}).filtered!
-
-          logger.debug "Request (exchange: #{@exchange.inspect}, queue: #{@queue.inspect}, " \
-                       "options: #{@headers}, message: #{@data})"
-
-          @action            ||= @headers['action']
-          @headers['action'] ||= @action
-          @version             = @headers['version']
-          @ip                  = @headers['ip']
-          @params              = @data['params'] || {}
-        rescue Oj::ParseError => e
-          log_error(e)
-          response.render_error(400, 'Bad request', e.inspect)
-          @failed = true
-        rescue StandardError => e
-          log_error(e)
-          response.render_error(500, 'Internal Server Error', e.inspect)
-          @failed = true
-        end
-      end
-    end
-  end
-end
+# frozen_string_literal: true
+
+module Fleck
+  module Core
+    class Consumer
+      class Request
+        include Fleck::Loggable
+
+        attr_reader :id, :response, :metadata, :payload, :action, :data, :headers, :version, :ip, :params, :status, :errors,
+                    :delivery_tag, :app_id, :reply_to, :created_at, :processed_at
+
+        def initialize(metadata, payload, delivery_info)
+          @created_at      = Time.now
+          @id              = metadata.correlation_id
+          logger.progname += " #{@id}"
+
+          @response      = Fleck::Core::Consumer::Response.new(metadata.correlation_id)
+          @metadata      = metadata
+          @app_id        = metadata[:app_id]
+          @reply_to      = @metadata.reply_to
+          @payload       = payload
+          @exchange      = delivery_info.exchange
+          @queue         = delivery_info.routing_key
+          @delivery_tag  = delivery_info.delivery_tag
+          @data          = {}
+          @headers       = (@metadata.headers || {}).to_hash_with_indifferent_access
+          @action        = @metadata.type
+          @version       = nil
+          @ip            = nil
+          @params        = {}
+          @failed        = false
+          @rejected      = false
+          @requeue       = false
+
+          parse_request!
+        end
+
+        def processed!
+          @processed_at = Time.now
+        end
+
+        def execution_time
+          ((@processed_at.to_f - @created_at.to_f) * 1000).round(2)
+        end
+
+        def failed?
+          @failed
+        end
+
+        def reject!(requeue: false)
+          @rejected = true
+          @requeue  = requeue
+          processed!
+        end
+
+        def rejected?
+          @rejected
+        end
+
+        def requeue?
+          @requeue
+        end
+
+        def log_headers_and_params!
+          queue_name = "(#{@exchange == '' ? @queue : "#{@queue}@#{@exchange}"})".color(:red)
+          endpoint = "/#{action} :#{@version || 'v1'}".color(:red)
+          message = "\n" \
+                    "#{ip} - #{queue_name} #{endpoint} [#{@id}]\n" \
+                    "  ~ headers ~ #{headers.inspect.color(:green)}\n" \
+                    "  @params #{params.inspect.color(:green)}"
+          logger.debug message
+        end
+
+        protected
+
+        def parse_request!
+          @data = Oj.load(@payload, mode: :compat).to_hash_with_indifferent_access.filtered!
+          @headers.merge!(@data['headers'] || {}).filtered!
+
+          logger.debug "Request (exchange: #{@exchange.inspect}, queue: #{@queue.inspect}, " \
+                       "options: #{@headers}, message: #{@data})"
+
+          @action            ||= @headers['action']
+          @headers['action'] ||= @action
+          @version             = @headers['version']
+          @ip                  = @headers['ip']
+          @params              = @data['params'] || {}
+        rescue Oj::ParseError => e
+          log_error(e)
+          response.render_error(400, 'Bad request', e.inspect)
+          @failed = true
+        rescue StandardError => e
+          log_error(e)
+          response.render_error(500, 'Internal Server Error', e.inspect)
+          @failed = true
+        end
+      end
+    end
+  end
+end

data/lib/fleck/core/consumer/response.rb

@@ -1,77 +1,77 @@
-
-module Fleck
-  module Core
-    class Consumer
-      class Response
-        include Fleck::Loggable
-
-        attr_accessor :id, :status, :errors, :headers, :body
-
-        def initialize(request_id)
-          @id = request_id
-          logger.progname += " #{@id}"
-
-          @status     = 200
-          @errors     = []
-          @headers    = {}
-          @body       = nil
-          @deprecated = false
-        end
-
-        def errors?
-          !@errors.empty?
-        end
-
-        def deprecated!
-          @deprecated = true
-        end
-
-        def deprecated?
-          @deprecated
-        end
-
-        def not_found(msg = nil)
-          @status = 404
-          @errors << 'Resource Not Found'
-          @errors << msg if msg
-        end
-
-        def render_error(status, msg = [])
-          raise ArgumentError, "Invalid status code: #{status.inspect}" unless (400..599).cover?(status.to_i)
-
-          @status = status.to_i
-          if msg.is_a?(Array)
-            @errors += msg
-          else
-            @errors << msg
-          end
-
-          @errors.compact!
-        end
-
-        def to_json(filter: false)
-          data = {
-            "status"     => @status,
-            "errors"     => @errors,
-            "headers"    => @headers,
-            "body"       => @body,
-            "deprecated" => @deprecated
-          }
-          data.filter! if filter
-
-          return Oj.dump(data, mode: :compat)
-        rescue => e
-          logger.error e.inspect + "\n" + e.backtrace.join("\n")
-          return Oj.dump({
-            "status" => 500,
-            "errors" => ['Internal Server Error', 'Failed to dump the response to JSON']
-          }, mode: :compat)
-        end
-
-        def to_s
-          return "#<#{self.class} #{self.to_json(filter: true)}>"
-        end
-      end
-    end
-  end
-end
+
+module Fleck
+  module Core
+    class Consumer
+      class Response
+        include Fleck::Loggable
+
+        attr_accessor :id, :status, :errors, :headers, :body
+
+        def initialize(request_id)
+          @id = request_id
+          logger.progname += " #{@id}"
+
+          @status     = 200
+          @errors     = []
+          @headers    = {}
+          @body       = nil
+          @deprecated = false
+        end
+
+        def errors?
+          !@errors.empty?
+        end
+
+        def deprecated!
+          @deprecated = true
+        end
+
+        def deprecated?
+          @deprecated
+        end
+
+        def not_found(msg = nil)
+          @status = 404
+          @errors << 'Resource Not Found'
+          @errors << msg if msg
+        end
+
+        def render_error(status, msg = [])
+          raise ArgumentError, "Invalid status code: #{status.inspect}" unless (400..599).cover?(status.to_i)
+
+          @status = status.to_i
+          if msg.is_a?(Array)
+            @errors += msg
+          else
+            @errors << msg
+          end
+
+          @errors.compact!
+        end
+
+        def to_json(filter: false)
+          data = {
+            "status"     => @status,
+            "errors"     => @errors,
+            "headers"    => @headers,
+            "body"       => @body,
+            "deprecated" => @deprecated
+          }
+          data.filter! if filter
+
+          return Oj.dump(data, mode: :compat)
+        rescue => e
+          logger.error e.inspect + "\n" + e.backtrace.join("\n")
+          return Oj.dump({
+            "status" => 500,
+            "errors" => ['Internal Server Error', 'Failed to dump the response to JSON']
+          }, mode: :compat)
+        end
+
+        def to_s
+          return "#<#{self.class} #{self.to_json(filter: true)}>"
+        end
+      end
+    end
+  end
+end