a_r_q_logger 0.0.8 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 73dcd0a5bfb16dd7b0889be277962c454ba6f794
-  data.tar.gz: 70378c5839a001193cfd8e6a3569932f46828101
+  metadata.gz: e77f5f0ec1b623ab24e5e2b493181138511469f6
+  data.tar.gz: 8592b04bd9f8d2cf749947ece215f3702546e6de
 SHA512:
-  metadata.gz: 99d6b045d48b0174cf4e608b12fee971ab1a748a50c692681d4d30bd54bbdc989b43eb85156f5992acfb0e889f94c06e6d03cc9cf649e7b7c8614493c433010b
-  data.tar.gz: 76259a3913e244d752888d755eb98b10e57e62501d24c2499199d9b7bdce860f818a43533f282f3be3b26daf7becd2c8eb796161f6bc34e3d47ee7e7d9dd479a
+  metadata.gz: 567bc7769be381d3090b53047bc8b30c75710cc45980a00cc61f4eeeab2c674da1ea6ab7b5f790712b3b88e303737d54dc58bd21a999ba207e7a4609aff5c407
+  data.tar.gz: d46ef32a7c741784ea67f5d2ef3605c065df1b6befbb5a436d5b741cc9c8496dbddb647960548ecddb6d745467e74dcbd2692e729a2bf4e837c49ada14febd79

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    a_r_q_logger (0.0.6)
+    a_r_q_logger (0.0.8)
       activerecord (>= 4.2)
 
 GEM

data/lib/a_r_q_logger.rb

@@ -1,20 +1,26 @@
 require 'a_r_q_logger/initializer'
+require 'monitor'
+
+# Thread.current.object_id
 
 module ARQLogger
-  class << self
-    attr_accessor :store, :instantiating
+  cattr_accessor :store, :mon
+
+  self.store = {}
+  self.mon = Monitor.new
 
-    def pass(event)
+  class << self
+    def sql(event)
       return unless store
 
       payload = event.payload
       if payload[:name] && !ActiveRecord::LogSubscriber::IGNORE_PAYLOAD_NAMES.include?(payload[:name])
-        store.push(event.duration)
+        mon.synchronize { store[key].push(event.duration) }
       end
     end
 
     def instantiate
-      self.instantiating += 1 if instantiating
+      mon.synchronize { store[key] && store[key].instantiate }
     end
 
     def log(&block)
@@ -26,28 +32,57 @@ module ARQLogger
     private
 
     def start
-      self.store = []
-      self.instantiating = 0
+      mon.synchronize do
+        raise CannotNestedStarting if store[key]
+
+        store[key] = Log.new(start_at: Time.now.to_i)
+      end
     end
 
     def finish
-      logged = store
-      instances = instantiating
-
-      self.store = nil
-      self.instantiating = nil
+      mon.synchronize do
+        store.delete(key).tap do |result|
+          result.finish(Time.now.to_i)
+        end
+      end
+    end
 
-      Result.new(
-        count: logged.size,
-        msec: logged.sum.round(1),
-        instances: instances
-      )
+    def key
+      Thread.current.object_id
     end
   end
 
-  class Result < Struct.new(:count, :msec, :instances)
-    def initialize(count:, msec:, instances:)
-      super(count, msec, instances)
+  class Log
+    attr_accessor :start_at, :queries, :duration, :instances
+
+    def initialize(start_at:)
+      @start_at = start_at
+
+      @queries = []
+      @instances = 0
+    end
+
+    def finish(end_at)
+      @duration = end_at - start_at
+    end
+
+    def instantiate
+      @instances += 1
+    end
+
+    def push(query)
+      @queries.push(query)
     end
+
+    def count
+      @queries.size
+    end
+
+    def queries_time
+      @queries.sum.round(1)
+    end
+  end
+
+  class CannotNestedStarting < StandardError
   end
 end

data/lib/a_r_q_logger/initializer.rb

@@ -6,7 +6,7 @@ module ARQLogger
           alias_method :real_sql, :sql
 
           def sql(event)
-            ARQLogger.pass(event)
+            ARQLogger.sql(event)
             real_sql(event)
           end
         end
@@ -26,3 +26,4 @@ elsif defined?(::Rails::Railtie)
     initializer('add pass method') { ARQLogger::Initializer.patch }
   end
 end
+

data/lib/a_r_q_logger/version.rb

@@ -1,3 +1,3 @@
 module ARQLogger
-  VERSION = "0.0.8"
+  VERSION = "1.0.0"
 end

data/spec/test_model_spec.rb

@@ -3,13 +3,12 @@ require 'supports/schema'
 require 'models/test_child_model'
 require 'models/test_model'
 require 'tempfile'
+require 'securerandom'
 
 ActiveRecord::Base.logger = Logger.new(Tempfile.new(''))
 
-
 require 'a_r_q_logger'
 
-
 RSpec.describe TestModel, type: :model do
   it do
     TestModel.create!
@@ -28,6 +27,44 @@ RSpec.describe TestModel, type: :model do
     }.count).to eq(2)
   end
 
+  context 'in multi thread' do
+    before do
+      TestModel.destroy_all
+    end
+
+    after do
+      TestModel.destroy_all
+    end
+
+    it do
+      threads = []
+
+      wrap = ARQLogger.log {
+        10.times do
+          threads.push(Thread.start do
+            ActiveRecord::Base.connection_pool.with_connection do
+              sleep rand(0..2) / 10
+              re = ARQLogger.log {
+                TestModel.create!
+                sleep rand(0..2) / 10
+                TestModel.create!
+                sleep rand(0..2) / 10
+                TestModel.create!
+              }
+              expect(re.count).to eq(3)
+              expect(re.instances).to eq(3)
+            end
+          end)
+        end
+      }
+
+      threads.each { |t| t.join }
+
+      expect(wrap.count).to eq(0)
+      expect(TestModel.count).to eq(30)
+    end
+  end
+
   context 'with associations' do
     before :all do
       TestModel.delete_all

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: a_r_q_logger
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 1.0.0
 platform: ruby
 authors:
 - mmmpa