restify 1.4.1 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ead12f1e1ea5dc63535ff85782767f164bc8092fc2fad879c6efab1852b18fd
-  data.tar.gz: 37d9f08cf939f668d9317f5ec4a8fa564fa908b23686c2f42904b1af911b012d
+  metadata.gz: 218f1484655662a863e6d65ae81f8f1cfe5e3127f9c795748b150236fe137225
+  data.tar.gz: 440710396a4f3879ad78766ef074edc85a51c5e40b7b8a3ac685e41b5060abf3
 SHA512:
-  metadata.gz: 04a147ae63f21761d3d86c4a5b57ed0006ce1b54c72ea9b89f4cc69fbb9fc560d2a84c605137cc1b4e8ac8d409d5f7e8707db08bb726c350fd050fcaecc93a68
-  data.tar.gz: b1382be6253e083bda252c8975ec2abe45b86c5af300fc878f6ba6ca0533cb34cf07be6553432c2167dba74aba558e561b2404e1d0639f07b33b997a9c413114
+  metadata.gz: 1d065b2b0b1080d937e311dcc7f820c41fad880262112887d57e5051888a069244809b3dd3e14307ce553277c82b8d56f602f5b891178f3df78b82aa45c13655
+  data.tar.gz: a4fd01db3ece23055dc2b3d4c297f5caf06bb93294cc4e9cd79a72fcca87340014d5f03b90603be32a2dff8006df6fb3a6375056258cae2e669643dca4024ef1

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+## 1.4.3
+
+* Add advanced logging capabilities using logging gem
+* Improve compatibility with webmocks returning `nil` as headers
+
 ## 1.4.1
 
 * Fix possible deadlock issues

data/lib/restify.rb

@@ -12,6 +12,8 @@ require 'addressable/template'
 #
 module Restify
   require 'restify/error'
+  require 'restify/logging'
+
   require 'restify/promise'
   require 'restify/registry'
   require 'restify/global'
@@ -27,6 +29,7 @@ module Restify
 
   module Adapter
     require 'restify/adapter/base'
+    require 'restify/adapter/typhoeus'
   end
 
   module Processors
@@ -34,8 +37,6 @@ module Restify
     require 'restify/processors/json'
   end
 
-  require 'restify/railtie' if defined?(Rails::Railtie)
-
   PROCESSORS = [Processors::Json].freeze
 
   extend Global

data/lib/restify/adapter/pooled_em.rb

@@ -6,8 +6,7 @@ require 'em-http-request'
 module Restify
   module Adapter
     class PooledEM < Base
-      # rubocop:disable RedundantFreeze
-      LOG_PROGNAME = 'restify.adapter.pooled-em'.freeze
+      include Logging
 
       # This class maintains a pool of connection objects, grouped by origin,
       # and ensures limits for total parallel requests and per-origin requests.
@@ -16,6 +15,8 @@ module Restify
       # When any of them are checked out for usage, it counts the usages to
       # prevent constraints being broken.
       class Pool
+        include Logging
+
         def initialize(size: 32, per_host: 6, connect_timeout: 2, inactivity_timeout: 10)
           @size = size
           @per_host = per_host
@@ -64,7 +65,7 @@ module Restify
           @available.unshift(conn) if @available.size < @size
           @used -= 1 if @used > 0
 
-          Restify.logger.debug(LOG_PROGNAME) do
+          logger.debug do
             "[#{conn.uri}] Released to pool (#{@available.size}/#{@used}/#{size})"
           end
 
@@ -76,7 +77,7 @@ module Restify
         def remove(conn)
           close(conn)
 
-          Restify.logger.debug(LOG_PROGNAME) do
+          logger.debug do
             "[#{conn.uri}] Removed from pool (#{@available.size}/#{@used}/#{size})"
           end
 
@@ -121,7 +122,7 @@ module Restify
         def reuse_connection(index, origin)
           @used += 1
           @available.delete_at(index).tap do
-            Restify.logger.debug(LOG_PROGNAME) do
+            logger.debug do
               "[#{origin}] Take connection from pool " \
                 "(#{@available.size}/#{@used}/#{size})"
             end
@@ -135,7 +136,7 @@ module Restify
 
           @used += 1
           new(origin).tap do
-            Restify.logger.debug(LOG_PROGNAME) do
+            logger.debug do
               "[#{origin}] Add new connection to pool " \
                 "(#{@available.size}/#{@used}/#{size})"
             end
@@ -145,14 +146,14 @@ module Restify
         def close_oldest
           close(@available.pop)
 
-          Restify.logger.debug(LOG_PROGNAME) do
+          logger.debug do
             "[#{origin}] Closed oldest connection in pool " \
               "(#{@available.size}/#{@used}/#{size})"
           end
         end
 
         def queue(defer)
-          Restify.logger.debug(LOG_PROGNAME) do
+          logger.debug do
             "[#{origin}] Wait for free slot " \
               "(#{@available.size}/#{@used}/#{size})"
           end
@@ -161,7 +162,7 @@ module Restify
         end
 
         def new(origin)
-          Restify.logger.debug(LOG_PROGNAME) do
+          logger.debug do
             "Connect to '#{origin}' " \
             "(#{@connect_timeout}/#{@inactivity_timeout})..."
           end
@@ -263,7 +264,7 @@ module Restify
           begin
             EventMachine.run {}
           rescue => e
-            puts "#{self.class} -> #{e}\n#{e.backtrace.join("\n")}"
+            logger.error(e)
             raise e
           end
         end

data/lib/restify/adapter/typhoeus.rb

@@ -5,8 +5,7 @@ require 'typhoeus'
 module Restify
   module Adapter
     class Typhoeus < Base
-      # rubocop:disable RedundantFreeze
-      LOG_PROGNAME = 'restify.adapter.typhoeus'.freeze
+      include Logging
 
       attr_reader :sync
 
@@ -27,11 +26,12 @@ module Restify
 
       def call_native(request, writer)
         @mutex.synchronize do
+          logger.debug { "[#{request.object_id}] Queue request #{request}" }
           @hydra.queue convert(request, writer)
           @hydra.dequeue_many
         end
 
-        sync? ? @hydra.run : start
+        sync? ? @hydra.run : thread.run
       end
 
       def queued?
@@ -53,6 +53,8 @@ module Restify
           connecttimeout: request.timeout
 
         req.on_complete do |response|
+          logger.debug { "[#{request.object_id}] Completed: #{response.code}" }
+
           if response.timed_out?
             writer.reject Restify::Timeout.new request
           elsif response.code == 0
@@ -75,26 +77,37 @@ module Restify
       end
 
       def convert_headers(headers)
-        headers.each_with_object({}) do |header, memo|
+        return {} unless headers.respond_to?(:each_pair)
+
+        headers.each_pair.each_with_object({}) do |header, memo|
           memo[header[0].upcase.tr('-', '_')] = header[1]
         end
       end
 
-      def start
-        thread.run
+      def thread
+        if @thread.nil? || !@thread.status
+          # Recreate thread if nil or dead
+          @thread = Thread.new { _loop }
+        end
+
+        @thread
       end
 
-      def thread
-        @thread ||= Thread.new do
-          loop do
-            begin
-              @hydra.run
-              Thread.stop unless queued?
-            rescue StandardError => e
-              puts "#{self.class}: #{e.message}"
-            end
-          end
+      def _loop
+        loop { _run }
+      end
+
+      def _run
+        if queued?
+          logger.debug { 'Run hydra' }
+          @hydra.run
+          logger.debug { 'Hydra finished' }
+        else
+          logger.debug { 'Pause hydra thread' }
+          Thread.stop
         end
+      rescue StandardError => e
+        logger.error(e)
       end
     end
   end

data/lib/restify/global.rb

@@ -10,7 +10,6 @@ module Restify
 
     def adapter
       @adapter ||= begin
-        require 'restify/adapter/typhoeus'
         Restify::Adapter::Typhoeus.new
       end
     end
@@ -31,13 +30,11 @@ module Restify
     end
 
     def logger
-      @logger ||= ::Logger.new(STDOUT).tap do |logger|
-        logger.level = :info
-      end
+      ::Logging.logger[Restify]
     end
 
     def logger=(logger)
-      @logger = logger
+
     end
 
     private

data/lib/restify/logging.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'logging'
+
+module Restify
+  module Logging
+    def logger
+      @logger ||= ::Logging.logger[self]
+    end
+  end
+end

data/lib/restify/request.rb

@@ -44,5 +44,9 @@ module Restify
         JSON.dump(data) unless data.nil?
       end
     end
+
+    def to_s
+      "#<#{self.class} #{method.upcase} #{uri}>"
+    end
   end
 end

data/lib/restify/version.rb

@@ -4,7 +4,7 @@ module Restify
   module VERSION
     MAJOR = 1
     MINOR = 4
-    PATCH = 1
+    PATCH = 3
     STAGE = nil
     STRING = [MAJOR, MINOR, PATCH, STAGE].reject(&:nil?).join('.').freeze
 

data/spec/spec_helper.rb

@@ -41,7 +41,10 @@ RSpec.configure do |config|
   config.order = 'random'
 
   config.before(:each) do
-    Restify.logger.level = Logger::DEBUG
+    Ethon.logger = ::Logging.logger[Ethon] if defined?(Ethon)
+
+    ::Logging.logger.root.level = :debug
+    ::Logging.logger.root.add_appenders ::Logging.appenders.stdout
   end
 
   config.after(:each) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restify
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.3
 platform: ruby
 authors:
 - Jan Graichen
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -129,10 +143,10 @@ files:
 - lib/restify/error.rb
 - lib/restify/global.rb
 - lib/restify/link.rb
+- lib/restify/logging.rb
 - lib/restify/processors/base.rb
 - lib/restify/processors/json.rb
 - lib/restify/promise.rb
-- lib/restify/railtie.rb
 - lib/restify/registry.rb
 - lib/restify/relation.rb
 - lib/restify/request.rb

data/lib/restify/railtie.rb

@@ -1,11 +0,0 @@
-# frozen_string_literal: true
-
-module Restify
-  class Railtie < Rails::Railtie
-    initializer 'restify.logger' do
-      config.after_initialize do
-        Restify.logger = Rails.logger
-      end
-    end
-  end
-end