pg-connection-general_log 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7825d72bab21243fca9b81dd2f6b3d5f9514e346
-  data.tar.gz: f31e2f859992fac1039450a8f42f1b22e5c7b91c
+  metadata.gz: b1d256e00f37404799aeb51dc7f5dd6aab648eb2
+  data.tar.gz: b4380f27151de0fbcb30e5920ee519c9f8c3e2da
 SHA512:
-  metadata.gz: caa984d618acbbd775e7fb840662c16aa4403305aec814e0cbefecce23097d7c4abdec7439aece1c1231604d91a557687d6834214d8a7316ca1a94f03929ab45
-  data.tar.gz: 2490d74401305db28a85a78c6b24cac8305c369630f5d7a4a37bffcdd8dbab55c4cd4ace7ee2eb861057ee61445c029438b830c6266a442513cb9856b2a6a63d
+  metadata.gz: e1237391687bdbe6a51421c385492c5983bdd29d5436c79c0b7b927fbc137ecda28e5209eaba84f00690af16cc67e9b75c3a905eaa872efccb11cafafbd21346
+  data.tar.gz: 811f8a7dee59434860f688f370013b672b6a8ebb09cced6c2b1e342646499324268119aaab250ccf1d6dc8a21d86db20eb189b3e5b5a7e2ab01abcbc322468e8

data/lib/pg/connection/general_log.rb

@@ -17,7 +17,7 @@ module PG
         end
 
         def general_log_with_request_id(request_id)
-          Thread.current.dig(:general_log, request_id)
+          Thread.current[:general_log]&.fetch(request_id)
         end
 
         def delete_general_log(request_id)

data/lib/pg/connection/general_log/middleware.rb

@@ -1,3 +1,5 @@
+require 'securerandom'
+
 module PG
   class Connection
     module GeneralLog
@@ -17,18 +19,22 @@ module PG
 
         def call(env)
           if Middleware.enabled
-            request = Rack::Request.new env
-            request_id = request.uuid
+            request = Rack::Request.new(env)
+            request_id = extract_request_id(env)
             Thread.current[:request_id] = request_id
           end
           @app.call(env)
         ensure
           if Middleware.enabled
-            GeneralLog.general_log_with_request_id(request_id).writefile(request)
+            GeneralLog.general_log_with_request_id(request_id)&.writefile(request)
             GeneralLog.delete_general_log(request_id)
             Thread.current[:request_id] = nil
           end
         end
+
+        def extract_request_id(env)
+          env['action_dispatch.request_id'] || env['HTTP_X_REQUEST_ID'] || SecureRandom.hex(16)
+        end
       end
     end
   end

data/lib/pg/connection/general_log/version.rb

@@ -1,7 +1,7 @@
 module PG
   class Connection
     module GeneralLog
-      VERSION = "0.0.3"
+      VERSION = "0.0.4"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pg-connection-general_log
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - abcang