evt-event_store-http 0.1.0.3 → 0.1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aca3a6fee5edb1d2367334e198b9ced8419f8ee9
-  data.tar.gz: ce4a4948e04747920887f7890c0736c33d09575f
+  metadata.gz: c67475ec347e53c35aa0b901573f2bdbba594a7c
+  data.tar.gz: a33092fc4b2eee84c8107f4fd9456874b3caf58e
 SHA512:
-  metadata.gz: baa42539a3390a19cdc89a39c91794ae7e4929128c5d6bcb51d478a56e5d2dec0027cfc7acf3434bfcf628e7abc57147a3383a0498cb30a9d1e445ed8c156851
-  data.tar.gz: f8b64d45aec01490aebc9c2c30dcec61b501273fdb0327c6538eab3db1fd48b2347231e364658aed64d7ee4553bf520dd9a7080313cd508129f37fa5928dd19c
+  metadata.gz: 584090dea2da4c8b5f88a99f0346866dcc62bead9aa318d548fccf6eba41e53f97f81b609b32aad09ab43386b4ee3d93bdf25610bb19562748ce97fc66e2df66
+  data.tar.gz: 014f11e8dd3dcf65d90e643d1ab00ac4cc2a49650de61627832f159c519ac9b9b5f5212686ad5781a3e7e9f0be9b75a04d1c7d26ddc1b29124d0fd3ee26839ad

data/lib/event_store/http/session.rb

@@ -32,8 +32,17 @@ module EventStore
 
       def request(request)
         logger.trace { "Issuing request (#{LogText.request request})" }
-        data_logger.trace { "Request headers: #{LogText.header_data request}" }
-        data_logger.trace { "Request data: #{LogText.body_data request}" }
+
+        data_logger.trace {
+          <<~TEXT
+          Issuing request
+          
+          #{request.method} #{request.path}
+          #{LogText.header_data request}
+
+          #{LogText.body_data request}
+          TEXT
+        }
 
         self.retry.() do |_retry|
           begin
@@ -47,14 +56,21 @@ module EventStore
             _retry.failed error
           end
 
-          logger.debug { "Received response (#{LogText.request request, response})" }
-
-          data_logger.debug { "Request: #{request.method} #{request.path}" }
-          data_logger.debug { "Request headers: #{LogText.header_data request}" }
-          data_logger.debug { "Request data: #{LogText.body_data request}" }
-          data_logger.debug { "Response: #{response.code} #{response.message}" }
-          data_logger.debug { "Response headers: #{LogText.header_data response}" }
-          data_logger.debug { "Response data: #{LogText.body_data response}" }
+          logger.debug { "Request completed (#{LogText.request request, response})" }
+
+          data_logger.debug {
+            <<~TEXT
+            Request completed
+            
+            #{request.method} #{request.path}
+            #{LogText.header_data request}
+            #{LogText.body_data request}
+
+            HTTP/#{response.http_version} #{response.code} #{response.message}
+            #{LogText.header_data response}
+            #{LogText.body_data response}
+            TEXT
+          }
 
           if Net::HTTPServerError === response
             logger.warn { "Server error (#{LogText.request request, response})" }

data/lib/event_store/http/session/log_text.rb

@@ -15,24 +15,26 @@ module EventStore
         def self.header_data(message)
           text = String.new
 
+          if message['host']
+            text << "host: #{message['host']}\n"
+          end
+
           message.each_header do |name, value|
+            next if name == 'host'
+
             text << "#{name}: #{value}\n"
           end
 
-          if text.empty?
-            text << "(none)"
-          else
-            text.insert 0, "\n\n"
-          end
+          text << "(no headers)" if text.empty?
 
           text
         end
 
         def self.body_data(message)
           if message.body.to_s.empty?
-            '(none)'
+            '(no body)'
           else
-            "\n\n#{message.body}\n"
+            message.body
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evt-event_store-http
 version: !ruby/object:Gem::Version
-  version: 0.1.0.3
+  version: 0.1.0.4
 platform: ruby
 authors:
 - The Eventide Project