akita-har_logger 0.2.10 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26fd1b1b5e2ccf962928f85e6969b50f63766571f40cf442cf5b615bb44559e9
-  data.tar.gz: b6e0ef99924d4b9db81fa0c0981cdc84d41e11930493843c110bc595bdee9447
+  metadata.gz: 9eed2465cdafed5eb9d0af31022054193efdcd6ba8b2866a466c51554e24ab43
+  data.tar.gz: 4553cd54a99c9d1a2958657e90b31deeb40e237d508bbd1b80c9cbc59064ef64
 SHA512:
-  metadata.gz: c4953346d8f0f2169aea261ebab4768e3868cfbd0511c0d276791b06b6c2e5871f5d054b869b2d3fed0c99eb5d3cad7712bf7a9dd15d2698052da5e22ff3d756
-  data.tar.gz: bc46a89f9eeea951a20e34ed9a2bab0c9dee5fd7a8e5ed996d2fe06942d917279345bae0e12c662a0423baff927790dde4c82a99baf834537615deb1d62b796e
+  metadata.gz: 04ff7a6f33614994d7bc82d4fb52b5b3957be1f405df36316330dd811d7949968325eaf997276d775e85f1df17461c4733cebdae9eeef6fb0bd4be53f309cdb0
+  data.tar.gz: f0325184bc764d7eba84573d164bed1c676300cfac8f27b63dafea6f0ebafe80dd58cacc965c694830355c603a7a23b6c2435b3a1b92c22be89093c06869cc0e

data/Gemfile.lock

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

data/lib/akita/har_logger.rb

@@ -33,6 +33,9 @@ module Akita
         end
 
         @entry_queue = HarLogger.get_queue(out_file_name)
+      rescue => e
+        HarLogger.logException("initializing middleware", e)
+        raise
       end
 
       def call(env)
@@ -59,9 +62,21 @@ module Akita
         env['rack.input'] = saved_input
 
         [ status, headers, body ]
+      rescue => e
+        HarLogger.logException("handling request", e)
+        raise
       end
     end
 
+    # Logs the given exception.
+    def self.logException(context, e)
+      Rails.logger.debug "AKITA: Exception while #{context}: #{e.message} "\
+                         "(#{e.class.name}) in thread #{Thread.current}"
+      e.backtrace.each { |frame|
+        Rails.logger.debug "AKITA:   #{frame}"
+      }
+    end
+
     # Logging filter for `ActionController`s.
     # TODO: Some amount of code duplication here. Should refactor.
     class Filter
@@ -71,6 +86,9 @@ module Akita
         end
 
         @entry_queue = HarLogger.get_queue(out_file_name)
+      rescue => e
+        HarLogger.logException("initializing filter", e)
+        raise
       end
 
       # Registers an `on_load` initializer to add a logging filter to any
@@ -108,6 +126,9 @@ module Akita
 
         # Be kind and restore the original request-body stream.
         request.env['rack.input'] = saved_input
+      rescue => e
+        HarLogger.logException("handling request", e)
+        raise
       end
     end
 
@@ -128,13 +149,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_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.10"
+    VERSION = "0.2.14"
   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.10
+  version: 0.2.14
 platform: ruby
 authors:
 - Jed Liu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2021-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec