rester 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9bb523b9b23530a59e8bc2a8fc8463324739b59d
-  data.tar.gz: 26d4a6f4cd0de0417b470357488c0ed941e8f8a8
+  metadata.gz: 3b1b078a9a8b96e20d3696c745045d29318a91d1
+  data.tar.gz: cbd9a3d38d93f5d561410adeda08032a5e6ff3e6
 SHA512:
-  metadata.gz: 9456f4f73aa5e8516e3731a273954a254735de21025dcdac36e70209e922f1ce4ee335b865a32efb4c01e6225ddfbd4161c3d89cc85096bd02521b09c6c5b3eb
-  data.tar.gz: 1ad4848eb57cd9770a6c9185c4b9f136111083a258ec9bff59addd160801e6e2865c02623ddbae1b4fb6bebe5152080b3566389cf5d3497d2ec1d51406936713
+  metadata.gz: b7a84b105b14c90d3418d8f83fdbd0d5ce5814c1ce27d2cc813e8a43d58801cf800834e2dce7da45303f7dcb74d91a186abf1e735575272e400b1d68a345919a
+  data.tar.gz: 2d4a18a37b90f58a8cf3a06e917c9719a8a0269c71e089ba2cce160a0e87fcfd908a7ce9818b4262a8076e9929813d630d953ca3c6e1e2e143f66562679876aa

data/lib/rester/client/middleware/request_handler.rb

@@ -2,12 +2,11 @@ module Rester
   module Client::Middleware
     class RequestHandler < Base
       def call(env)
-        Rester.begin_request
-        Rester.correlation_id = SecureRandom.uuid
-        Rester.request_info[:consumer_name] = Rester.service_name
-        super
-      ensure
-        Rester.end_request
+        Rester.wrap_request do
+          Rester.correlation_id = SecureRandom.uuid
+          Rester.request_info[:consumer_name] = Rester.service_name
+          super
+        end
       end
     end # RequestHandlers
   end # Client::Middleware

data/lib/rester/client.rb

@@ -35,7 +35,8 @@ module Rester
 
     def connected?
       adapter.connected? && @_requester.call(:get, '/ping', {}).successful?
-    rescue
+    rescue Exception => e
+      logger.error("Connection Error: #{e.inspect}")
       false
     end
 
@@ -122,15 +123,17 @@ module Rester
     ##
     # Add a correlation ID to the header and send the request to the adapter
     def _request(verb, path, params)
-      Rester.request_info[:producer_name] = name
-      Rester.request_info[:path] = path
-      Rester.request_info[:verb] = verb
-      logger.info('sending request')
-
-      _set_default_headers
-      start_time = Time.now.to_f
-      response = adapter.request(verb, path, params)
-      _process_response(start_time, verb, path, *response)
+      Rester.wrap_request do
+        Rester.request_info[:producer_name] = name
+        Rester.request_info[:path] = path
+        Rester.request_info[:verb] = verb
+        logger.info('sending request')
+
+        _set_default_headers
+        start_time = Time.now.to_f
+        response = adapter.request(verb, path, params)
+        _process_response(start_time, verb, path, *response)
+      end
     end
 
     def _set_default_headers

data/lib/rester/service/middleware/request_handler.rb

@@ -5,25 +5,24 @@ module Rester
     # perform the necessary logging. Cleanup the request once it's complete.
     class RequestHandler < Base
       def call(env)
-        Rester.begin_request
-        Rester.request = request = Rester::Service::Request.new(env)
-        Rester.correlation_id = request.correlation_id
-        Rester.request_info[:producer_name] = service.name
-        Rester.request_info[:consumer_name] = request.consumer_name
-        Rester.request_info[:path] = request.path_info
-        Rester.request_info[:verb] = request.request_method
+        Rester.wrap_request do
+          Rester.request = request = Rester::Service::Request.new(env)
+          Rester.correlation_id = request.correlation_id
+          Rester.request_info[:producer_name] = service.name
+          Rester.request_info[:consumer_name] = request.consumer_name
+          Rester.request_info[:path] = request.path_info
+          Rester.request_info[:verb] = request.request_method
 
-        service.logger.info('request received')
+          service.logger.info('request received')
 
-        start_time = Time.now.to_f
-        super.tap { |response|
-          elapsed_ms = (Time.now.to_f - start_time) * 1000
-          response[1]["X-Rester-Producer-Name"] = service.name
-          service.logger.info("responding with #{response[0]} after %0.3fms" %
-            elapsed_ms)
-        }
-      ensure
-        Rester.end_request
+          start_time = Time.now.to_f
+          super.tap { |response|
+            elapsed_ms = (Time.now.to_f - start_time) * 1000
+            response[1]["X-Rester-Producer-Name"] = service.name
+            service.logger.info("responding with #{response[0]} after %0.3fms" %
+              elapsed_ms)
+          }
+        end
       end
     end # RequestHandler
   end # Service::Middleware

data/lib/rester/version.rb

@@ -1,3 +1,3 @@
 module Rester
-  VERSION = '0.5.2'
+  VERSION = '0.5.3'
 end

data/lib/rester.rb

@@ -47,12 +47,15 @@ module Rester
       @_service_name = name
     end
 
-    def begin_request
-      self.request_info = {}
-    end
-
-    def end_request
-      self.request_info = nil
+    ##
+    # Used to manage the thread-safe `Rester.request_info` object.
+    def wrap_request
+      outer_most = !request_info
+
+      self.request_info = {} if outer_most
+      yield
+    ensure
+      self.request_info = nil if outer_most
     end
 
     def processing_request?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rester
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Robert Honer