fleck 1.0.1 → 2.1.2

data/lib/fleck/client.rb

@@ -1,124 +1,124 @@
-
-module Fleck
-  class Client
-    include Fleck::Loggable
-
-    attr_reader :local_ip, :remote_ip
-
-    def initialize(connection, queue_name = "", exchange_type: :direct, exchange_name: "", multiple_responses: false, concurrency: 1)
-      @connection         = connection
-      @queue_name         = queue_name
-      @multiple_responses = multiple_responses
-      @default_timeout    = multiple_responses ? 60 : nil
-      @concurrency        = [concurrency.to_i, 1].max
-      @requests           = ThreadSafe::Hash.new
-      @subscriptions      = ThreadSafe::Array.new
-      @terminated         = false
-      @mutex              = Mutex.new
-      @local_ip           = @connection.transport.socket.local_address.ip_address
-      @remote_ip          = @connection.transport.socket.remote_address.ip_address
-
-      @channel     = @connection.create_channel
-      @exchange    = Bunny::Exchange.new(@channel, :direct, 'fleck')
-      @publisher   = Bunny::Exchange.new(@connection.create_channel, exchange_type, exchange_name)
-      @reply_queue = @channel.queue("", exclusive: true, auto_delete: true)
-      @reply_queue.bind(@exchange, routing_key: @reply_queue.name)
-
-      handle_returned_messages!
-      @concurrency.times { handle_responses! }
-
-      logger.debug("Client initialized!")
-
-      at_exit do
-        terminate
-      end
-    end
-
-    def request(action: nil, version: nil, headers: {}, params: {}, async: @multiple_responses || false, timeout: @default_timeout, queue: @queue_name, rmq_options: {}, &block)
-
-      if @terminated
-        return Fleck::Client::Response.new(Oj.dump({status: 503, errors: ['Service Unavailable'], body: nil} , mode: :compat))
-      end
-
-      request = Fleck::Client::Request.new(
-        self, queue, @reply_queue.name,
-        action:             action,
-        version:            version,
-        headers:            headers,
-        params:             params,
-        timeout:            timeout,
-        multiple_responses: @multiple_responses,
-        rmq_options:        rmq_options,
-        &block
-      )
-
-      @requests[request.id] = request
-      request.send!(async)
-
-      return request.response
-    end
-
-
-    def publish(data, options)
-      return if @terminated
-      @mutex.synchronize { @publisher.publish(data, options) }
-    end
-
-
-    def remove_request(request_id)
-      @requests.delete request_id
-    end
-
-
-    def terminate
-      @terminated = true
-      logger.info "Unsubscribing from #{@reply_queue.name}"
-      @subscriptions.map(&:cancel) # stop receiving new messages
-      logger.info "Canceling pending requests"
-      # cancel pending requests
-      while item = @requests.shift do
-        begin
-          item[1].cancel!
-        rescue => e
-          logger.error e.inspect + "\n" + e.backtrace.join("\n")
-        end
-      end
-    end
-
-
-    protected
-
-    def handle_returned_messages!
-      @exchange.on_return do |return_info, metadata, content|
-        begin
-          logger.warn "Request #{metadata[:correlation_id]} returned"
-          request = @requests[metadata[:correlation_id]]
-          if request
-            request.cancel!
-          end
-        rescue => e
-          logger.error e.inspect + "\n" + e.backtrace.join("\n")
-        end
-      end
-    end
-
-    def handle_responses!
-      @subscriptions << @reply_queue.subscribe do |delivery_info, metadata, payload|
-        begin
-          logger.debug "Response received: #{payload}"
-          request = @requests[metadata[:correlation_id]]
-          if request
-            request.response = Fleck::Client::Response.new(payload)
-          else
-            logger.warn "Request #{metadata[:correlation_id]} not found!"
-          end
-        rescue => e
-          logger.error e.inspect + "\n" + e.backtrace.join("\n")
-        end
-      end
-    end
-  end
-end
-
-require "fleck/client/request"
-require "fleck/client/response"
+
+module Fleck
+  class Client
+    include Fleck::Loggable
+
+    attr_reader :local_ip, :remote_ip
+
+    def initialize(connection, queue_name = "", exchange_type: :direct, exchange_name: "", multiple_responses: false, concurrency: 1)
+      @connection         = connection
+      @queue_name         = queue_name
+      @multiple_responses = multiple_responses
+      @default_timeout    = multiple_responses ? 60 : nil
+      @concurrency        = [concurrency.to_i, 1].max
+      @requests           = ThreadSafe::Hash.new
+      @subscriptions      = ThreadSafe::Array.new
+      @terminated         = false
+      @mutex              = Mutex.new
+      @local_ip           = @connection.transport.socket.local_address.ip_address
+      @remote_ip          = @connection.transport.socket.remote_address.ip_address
+
+      @channel     = @connection.create_channel
+      @exchange    = Bunny::Exchange.new(@channel, :direct, 'fleck')
+      @publisher   = Bunny::Exchange.new(@connection.create_channel, exchange_type, exchange_name)
+      @reply_queue = @channel.queue("", exclusive: true, auto_delete: true)
+      @reply_queue.bind(@exchange, routing_key: @reply_queue.name)
+
+      handle_returned_messages!
+      @concurrency.times { handle_responses! }
+
+      logger.debug("Client initialized!")
+
+      at_exit do
+        terminate
+      end
+    end
+
+    def request(action: nil, version: nil, headers: {}, params: {}, async: @multiple_responses || false, timeout: @default_timeout, queue: @queue_name, rmq_options: {}, &block)
+
+      if @terminated
+        return Fleck::Client::Response.new(Oj.dump({status: 503, errors: ['Service Unavailable'], body: nil} , mode: :compat))
+      end
+
+      request = Fleck::Client::Request.new(
+        self, queue, @reply_queue.name,
+        action:             action,
+        version:            version,
+        headers:            headers,
+        params:             params,
+        timeout:            timeout,
+        multiple_responses: @multiple_responses,
+        rmq_options:        rmq_options,
+        &block
+      )
+
+      @requests[request.id] = request
+      request.send!(async)
+
+      return request.response
+    end
+
+
+    def publish(data, options)
+      return if @terminated
+      @mutex.synchronize { @publisher.publish(data, options) }
+    end
+
+
+    def remove_request(request_id)
+      @requests.delete request_id
+    end
+
+
+    def terminate
+      @terminated = true
+      logger.info "Unsubscribing from #{@reply_queue.name}"
+      @subscriptions.map(&:cancel) # stop receiving new messages
+      logger.info "Canceling pending requests"
+      # cancel pending requests
+      while item = @requests.shift do
+        begin
+          item[1].cancel!
+        rescue => e
+          logger.error e.inspect + "\n" + e.backtrace.join("\n")
+        end
+      end
+    end
+
+
+    protected
+
+    def handle_returned_messages!
+      @exchange.on_return do |return_info, metadata, content|
+        begin
+          logger.warn "Request #{metadata[:correlation_id]} returned"
+          request = @requests[metadata[:correlation_id]]
+          if request
+            request.cancel!
+          end
+        rescue => e
+          logger.error e.inspect + "\n" + e.backtrace.join("\n")
+        end
+      end
+    end
+
+    def handle_responses!
+      @subscriptions << @reply_queue.subscribe do |delivery_info, metadata, payload|
+        begin
+          logger.debug "Response received: #{payload}"
+          request = @requests[metadata[:correlation_id]]
+          if request
+            request.response = Fleck::Client::Response.new(payload)
+          else
+            logger.warn "Request #{metadata[:correlation_id]} not found!"
+          end
+        rescue => e
+          logger.error e.inspect + "\n" + e.backtrace.join("\n")
+        end
+      end
+    end
+  end
+end
+
+require "fleck/client/request"
+require "fleck/client/response"

data/lib/fleck/configuration.rb

@@ -1,144 +1,147 @@
-
-module Fleck
-  class Configuration
-
-    attr_reader :logfile, :loglevel, :progname, :hosts
-    attr_accessor :default_user, :default_pass, :default_host, :default_port, :default_vhost, :default_queue,
-                  :app_name, :filters
-
-    def initialize
-      @logfile       = STDOUT
-      @loglevel      = ::Logger::INFO
-      @progname      = "Fleck"
-      @app_name      = $0
-      @default_host  = "127.0.0.1"
-      @default_port  = 5672
-      @default_user  = nil
-      @default_pass  = nil
-      @default_vhost = "/"
-      @default_queue = "default"
-      @filters       = ["password", "secret", "token"]
-      @hosts         = []
-      @credentials   = {}
-    end
-
-    def hosts=(*args)
-      args.flatten.each do |host|
-        add_host host
-      end
-      return @hosts
-    end
-
-    def add_host(data)
-      if data.is_a?(String)
-        host, port = data.split(":")
-        port = port ? port.to_i : 5672
-        @hosts << Fleck::HostRating.new(host: host, port: port)
-        @credentials["#{host}:#{port}"] ||= { user: @default_user, pass: @default_pass }
-      elsif data.is_a?(Hash)
-        data = data.to_hash_with_indifferent_access
-        host = data[:host] || @default_host
-        port = data[:port] || @default_port
-        @hosts << Fleck::HostRating.new(host: data[:host] || @default_host, port: data[:port] || @default_port)
-        @credentials["#{host}:#{port}"] ||= { user: data[:user] || @default_user, pass: data[:pass] || @default_pass }
-      else
-        raise ArgumentError.new("Invalid host type #{data.inspect}: String or Hash expected")
-      end
-    end
-
-    def default_options
-      best = @hosts.sort.first
-      opts = {}
-
-      host = best ? best.host : @default_host
-      port = best ? best.port : @default_port
-      credentials = @credentials["#{host}:#{port}"] || {user: @default_user, pass: @default_pass}
-
-      opts[:host]  = host
-      opts[:port]  = port
-      opts[:user]  = credentials[:user] || @default_user
-      opts[:pass]  = credentials[:pass] || @default_pass
-      opts[:vhost] = @default_vhost
-      opts[:queue] = @default_queue
-
-      return opts
-    end
-
-    def logfile=(new_logfile)
-      if @logfile != new_logfile
-        @logfile = new_logfile
-        reset_logger
-      end
-
-      return @logfile
-    end
-
-    def loglevel=(new_loglevel)
-      @loglevel = new_loglevel
-      @logger.level = @loglevel if @logger
-
-      return @loglevel
-    end
-
-    def progname=(new_progname)
-      @progname = new_progname
-      @logger.progname = @progname if @logger
-
-      return @progname
-    end
-
-    def logger
-      return @logger || reset_logger
-    end
-
-    def logger=(new_logger)
-      if new_logger.nil?
-        @logger.close if @logger
-        @logger = ::Logger.new(nil)
-      else
-        @logger.close if @logger
-        @logger = new_logger.clone
-        @logger.formatter = formatter
-        @logger.progname  = @progname
-        @logger.level     = @loglevel
-      end
-
-      return @logger
-    end
-
-    def reset_logger
-      new_logger = ::Logger.new(@logfile)
-      new_logger.formatter = formatter
-      new_logger.progname  = @progname
-      new_logger.level     = @loglevel
-      @logger.close if @logger
-      @logger = new_logger
-
-      return @logger
-    end
-
-    def formatter
-      return @formatter if @formatter
-
-      @formatter = proc do |severity, datetime, progname, msg|
-        color = :blue
-        case severity
-        when 'DEBUG'
-          color = "#512DA8"
-        when 'INFO'
-          color = "#33691E"
-        when 'WARN'
-          color = "#E65100"
-        when 'ERROR', 'FATAL'
-          color = "#B71C1C"
-        else
-          color = "#00BCD4"
-        end
-        "[#{datetime.strftime('%F %T.%L')}]".color(:cyan) + "(#{$$})".color(:blue) + "|#{severity}|".color(color) +
-        (progname ? "<#{progname}>".color(:yellow) : "")  + " #{msg}\n"
-      end
-
-      return @formatter
-    end
-  end
-end
+# frozen_string_literal: true
+
+# Open `Fleck` module to add `Configuration` class implementation.
+module Fleck
+  # `Fleck::Configuration` implements a set of methods useful for `Fleck` clients and consumers configuration.
+  class Configuration
+    attr_reader :logfile, :loglevel, :progname, :hosts
+    attr_accessor :default_user, :default_pass, :default_host, :default_port, :default_vhost, :default_queue,
+                  :app_name, :filters
+
+    def initialize
+      @logfile       = $stdout
+      @loglevel      = ::Logger::INFO
+      @progname      = 'Fleck'
+      @app_name      = $PROGRAM_NAME
+      @default_host  = '127.0.0.1'
+      @default_port  = 5672
+      @default_user  = nil
+      @default_pass  = nil
+      @default_vhost = '/'
+      @default_queue = 'default'
+      @filters       = %w[password secret token]
+      @hosts         = []
+      @credentials   = {}
+    end
+
+    def hosts=(*args)
+      args.flatten.each do |host|
+        add_host host
+      end
+    end
+
+    def add_host(data)
+      case data
+      when String then add_host_from_string(data)
+      when Hash then add_host_from_hash(data)
+      else
+        raise ArgumentError, "Invalid host type #{data.inspect}: String or Hash expected"
+      end
+    end
+
+    def default_options
+      best = @hosts.min
+      opts = {}
+
+      host = best ? best.host : @default_host
+      port = best ? best.port : @default_port
+      credentials = @credentials["#{host}:#{port}"] || { user: @default_user, pass: @default_pass }
+
+      opts[:host]  = host
+      opts[:port]  = port
+      opts[:user]  = credentials[:user] || @default_user
+      opts[:pass]  = credentials[:pass] || @default_pass
+      opts[:vhost] = @default_vhost
+      opts[:queue] = @default_queue
+
+      opts
+    end
+
+    def logfile=(new_logfile)
+      return unless @logfile != new_logfile
+
+      @logfile = new_logfile
+      reset_logger
+    end
+
+    def loglevel=(new_loglevel)
+      @loglevel = new_loglevel
+      @logger.level = @loglevel if @logger
+    end
+
+    def progname=(new_progname)
+      @progname = new_progname
+      @logger.progname = @progname if @logger
+    end
+
+    def logger
+      @logger || reset_logger
+    end
+
+    def logger=(new_logger)
+      @logger&.close
+
+      if new_logger.nil?
+        @logger = ::Logger.new(nil)
+      else
+        @logger = new_logger.clone
+        @logger.formatter = formatter
+        @logger.progname  = @progname
+        @logger.level     = @loglevel
+      end
+    end
+
+    def reset_logger
+      new_logger = ::Logger.new(@logfile)
+      new_logger.formatter = formatter
+      new_logger.progname  = @progname
+      new_logger.level     = @loglevel
+      @logger&.close
+      @logger = new_logger
+
+      @logger
+    end
+
+    def formatter
+      return @formatter if @formatter
+
+      @formatter = proc do |severity, datetime, progname, msg|
+        color = severity_color(severity)
+        "[#{datetime.strftime('%F %T.%L')}]".color(:cyan) +
+          "(#{$PID})".color(:blue) +
+          "|#{severity}|".color(color) +
+          (progname ? "<#{progname}>".color(:yellow) : '') +
+          " #{msg}\n"
+      end
+
+      @formatter
+    end
+
+    private
+
+    def add_host_from_string(data)
+      host, port = data.split(':')
+      port = port ? port.to_i : 5672
+      @hosts << Fleck::HostRating.new(host: host, port: port)
+      @credentials["#{host}:#{port}"] ||= { user: @default_user, pass: @default_pass }
+    end
+
+    def add_host_from_hash(data)
+      data = data.to_hash_with_indifferent_access
+      host = data[:host] || @default_host
+      port = data[:port] || @default_port
+      @hosts << Fleck::HostRating.new(host: host, port: port)
+      @credentials["#{host}:#{port}"] ||= { user: data[:user] || @default_user, pass: data[:pass] || @default_pass }
+    end
+
+    def severity_color(severity)
+      case severity
+      when 'DEBUG' then '#512DA8'
+      when 'INFO' then '#33691E'
+      when 'WARN' then '#E65100'
+      when 'ERROR', 'FATAL' then '#B71C1C'
+      else '#00BCD4'
+      end
+    end
+  end
+end