akita-har_logger 0.2.8 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c48c0c45ad4fc65a7dcfa32c042ff24039025111dead2a610c5b956e1cf24e9
-  data.tar.gz: 85becb20d70489a5d8e48d275e894b40325acf010714f1d9d8031a90ead03996
+  metadata.gz: 804312155d41d0e753f3b4e527fff9140fbd82ef27b9bda45a726e0ca52baea6
+  data.tar.gz: 8407df19c1bdbd64a432bf93b6ff0c22bf1c48a647832ede28d7fde6fb37fb0d
 SHA512:
-  metadata.gz: 02b3c2b375f134945aa2c7e20552771bc4829c7644b3e5d04561177e4806c2f0245b8219808e4fd608bd4da379187d7d4a2bb14e3b58ca72e69b737c14c83e57
-  data.tar.gz: 40bdf185b1dda6a8b83b124599931597f4363f61470ab5253645a4ff3ba028470f50254faffab63b7bf1b3334a96a86c01eb7ac005c39c1b589d98c3899ebeb5
+  metadata.gz: f4d42e38b8e5a1eb510a5d6ac6866a8455528306c063cfbfa9c97b7c38706096c38554d795fa78b723c64bf003b65ab6759645a63b7567a1f3b545df4915f283
+  data.tar.gz: ebe6c4aecfc66a61d8b68e807f07a51155f0b17e26054fac35aca1b5924f1bec38e9aebf74d6364fb78b4c1822ed4ce712cb41006779676cd210a60bd7ce8472

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    akita-har_logger (0.2.8)
+    akita-har_logger (0.2.12)
 
 GEM
   remote: https://rubygems.org/

data/lib/akita/har_logger.rb

@@ -37,18 +37,41 @@ module Akita
 
       def call(env)
         start_time = Time.now
+
+        # Read the request body here, in case there is non-Rack-compliant
+        # middleware in the stack that closes the request-body stream on us.
+        request_body = env['rack.input'].read
+        env['rack.input'].rewind  # Be kind.
+
         status, headers, body = @app.call(env)
         end_time = Time.now
 
         wait_time_ms = ((end_time.to_f - start_time.to_f) * 1000).round
 
+        # Patch env with our saved request body.
+        saved_input = env['rack.input']
+        env['rack.input'] = StringIO.new request_body
+
+        # Buffer the response body in case it's not a rewindable stream.
+        body = HarLogger.bufferBody(body)
+
         @entry_queue << (HarEntry.new start_time, wait_time_ms, env, status,
                                       headers, body)
 
+        # Be kind and restore the original request-body stream.
+        env['rack.input'] = saved_input
+
         [ status, headers, body ]
       end
     end
 
+    # Reads the given body into an array and returns the result.
+    def self.bufferBody(body)
+      result = []
+      body.each { |part| result << part }
+      result
+    end
+
     # Logging filter for `ActionController`s.
     # TODO: Some amount of code duplication here. Should refactor.
     class Filter
@@ -72,6 +95,11 @@ module Akita
       def around(controller)
         start_time = Time.now
 
+        # Read the request body here, in case there is non-Rack-compliant
+        # middleware in the stack that closes the request-body stream on us.
+        request_body = controller.response.request.env['rack.input'].read
+        controller.response.request.env['rack.input'].rewind  # Be kind.
+
         yield
 
         end_time = Time.now
@@ -80,9 +108,16 @@ module Akita
         response = controller.response
         request = response.request
 
+        # Patch env with our saved request body.
+        saved_input = request.env['rack.input']
+        request.env['rack.input'] = StringIO.new request_body
+
         @entry_queue << (HarEntry.new start_time, wait_time_ms, request.env,
                                       response.status, response.headers,
                                       [response.body])
+
+        # Be kind and restore the original request-body stream.
+        request.env['rack.input'] = saved_input
       end
     end
 
@@ -103,13 +138,23 @@ module Akita
     # queue.
     def self.get_queue(out_file_name)
       queue = nil
+      Rails.logger.debug "AKITA: About to acquire entry-queue mutex "\
+                         "#{@@entry_queues_mutex} in #{Thread.current}. "\
+                         "Self-owned? #{@@entry_queues_mutex.owned?}"
       @@entry_queues_mutex.synchronize {
-        if @@entry_queues.has_key?(out_file_name) then
-          return @@entry_queues[out_file_name]
+        begin
+          Rails.logger.debug "AKITA: Acquired entry-queue mutex "\
+                             "#{@@entry_queues_mutex} in #{Thread.current}."
+          if @@entry_queues.has_key?(out_file_name) then
+            return @@entry_queues[out_file_name]
+          end
+
+          queue = Queue.new
+          @@entry_queues[out_file_name] = queue
+        ensure
+          Rails.logger.debug "AKITA: About to release entry-queue mutex "\
+                             "#{@@entry_queues_mutex} in #{Thread.current}."
         end
-
-        queue = Queue.new
-        @@entry_queues[out_file_name] = queue
       }
 
       WriterThread.new out_file_name, queue

data/lib/akita/har_logger/http_request.rb

@@ -121,7 +121,8 @@ module Akita
             # Gracefully handle any characters that are invalid in the source
             # encoding and characters that have no UTF-8 representation by
             # replacing with '?'. Log a warning when this happens.
-            source = req.body.string.force_encoding(getPostDataCharSet(env))
+            sourceCharset = getPostDataCharSet(env)
+            source = String.new(req.body.read).force_encoding(sourceCharset)
             utf8EncodingSuccessful = false
             if source.valid_encoding? then
               begin

data/lib/akita/har_logger/http_response.rb

@@ -159,7 +159,9 @@ module Akita
 
       def getBodySize(body)
         length = 0
-        body.each { |part| length += part.bytesize }
+        # Convert each body part into a string in case we're dealing with
+        # non-Rack-compliant components.
+        body.each { |part| length += part.to_s.bytesize }
         length
       end
     end

data/lib/akita/har_logger/version.rb

@@ -2,6 +2,6 @@
 
 module Akita
   module HarLogger
-    VERSION = "0.2.8"
+    VERSION = "0.2.12"
   end
 end

data/lib/akita/har_logger/writer_thread.rb

@@ -15,42 +15,57 @@ module Akita
         shutdown_mutex = Mutex.new
 
         Thread.new do
+          Rails.logger.debug "AKITA: About to acquire shutdown mutex "\
+                             "#{shutdown_mutex} for file #{out_file_name} "\
+                             "in writer thread #{Thread.current}. "\
+                             "Self-owned? #{shutdown_mutex.owned?}"
           shutdown_mutex.synchronize {
-            File.open(out_file_name, 'w') { |f|
-              # Produce a preamble.
-              f.write <<~EOF.chomp
-                {
-                  "log": {
-                    "version": "1.2",
-                    "creator": {
-                      "name": "Akita HAR logger for Ruby",
-                      "version": "1.0.0"
-                    },
-                    "entries": [
-              EOF
+            begin
+              Rails.logger.debug "AKITA: Acquired shutdown mutex "\
+                                 "#{shutdown_mutex} for file "\
+                                 "#{out_file_name} in writer thread "\
+                                 "#{Thread.current}."
+              File.open(out_file_name, 'w') { |f|
+                # Produce a preamble.
+                f.write <<~EOF.chomp
+                  {
+                    "log": {
+                      "version": "1.2",
+                      "creator": {
+                        "name": "Akita HAR logger for Ruby",
+                        "version": "1.0.0"
+                      },
+                      "entries": [
+                EOF
 
-              first_entry = true
+                first_entry = true
 
-              loop do
-                entry = entry_queue.pop
-                if entry == nil then break end
+                loop do
+                  entry = entry_queue.pop
+                  if entry == nil then break end
 
-                # Emit comma separator if needed.
-                f.puts (first_entry ? '' : ',')
-                first_entry = false
+                  # Emit comma separator if needed.
+                  f.puts (first_entry ? '' : ',')
+                  first_entry = false
 
-                # Emit the dequeued entry.
-                f.write JSON.generate(entry)
-              end
+                  # Emit the dequeued entry.
+                  f.write JSON.generate(entry)
+                end
 
-              # Produce the epilogue.
-              f.write <<~EOF
+                # Produce the epilogue.
+                f.write <<~EOF
 
-                    ]
+                      ]
+                    }
                   }
-                }
-              EOF
-            }
+                EOF
+              }
+            ensure
+              Rails.logger.debug "AKITA: About to release shutdown mutex "\
+                                 "#{shutdown_mutex} for file "\
+                                 "#{out_file_name} in writer thread "\
+                                 "#{Thread.current}."
+            end
           }
         end
 
@@ -59,7 +74,18 @@ module Akita
           # Signal to the consumer that this is the end of the entry stream and
           # wait for the consumer to terminate.
           entry_queue << nil
-          shutdown_mutex.synchronize {}
+          Rails.logger.debug "AKITA: About to acquire shutdown mutex "\
+                             "#{shutdown_mutex} for file #{out_file_name} "\
+                             "while shutting down in #{Thread.current}. "\
+                             "Self-owned? #{shutdown_mutex.owned?}"
+          shutdown_mutex.synchronize {
+            Rails.logger.debug "AKITA: Acquired shutdown mutex "\
+                               "#{shutdown_mutex} for file #{out_file_name} "\
+                               "while shutting down in #{Thread.current}."
+            Rails.logger.debug "AKITA: About to release shutdown mutex "\
+                               "#{shutdown_mutex} for file #{out_file_name} "\
+                               "while shutting down in #{Thread.current}."
+          }
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: akita-har_logger
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.12
 platform: ruby
 authors:
 - Jed Liu
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-15 00:00:00.000000000 Z
+date: 2021-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -54,7 +54,7 @@ licenses:
 metadata:
   homepage_uri: https://akitasoftware.com/
   source_code_uri: https://github.com/akitasoftware/akita-rails-har-logger
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -69,8 +69,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.21
+signing_key:
 specification_version: 4
 summary: Rails middleware for HAR logging
 test_files: []