glimpse-mysql2 1.0.0 → 1.1.0

data/CHANGELOG.md

@@ -0,0 +1,7 @@
+# 1.0.0
+
+- Initial release.
+
+# 1.1.0
+
+- Query count and Query time are now threadsafe.

data/glimpse-mysql2.gemspec

@@ -17,5 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
+  gem.add_dependency 'glimpse'
   gem.add_dependency 'mysql2'
+  gem.add_dependency 'atomic', '>= 1.0.0'
 end

data/lib/glimpse-mysql2/version.rb

@@ -1,5 +1,5 @@
 module Glimpse
   module Mysql2
-    VERSION = '1.0.0'
+    VERSION = '1.1.0'
   end
 end

data/lib/glimpse/views/mysql2.rb

@@ -1,19 +1,21 @@
 require 'mysql2'
+require 'atomic'
 
 # Instrument SQL time
 class Mysql2::Client
   class << self
     attr_accessor :query_time, :query_count
   end
-  self.query_count = 0
-  self.query_time = 0
+  self.query_count = Atomic.new(0)
+  self.query_time = Atomic.new(0)
 
   def query_with_timing(*args)
     start = Time.now
     query_without_timing(*args)
   ensure
-    Mysql2::Client.query_time += (Time.now - start)
-    Mysql2::Client.query_count += 1
+    duration = (Time.now - start)
+    Mysql2::Client.query_time.update { |value| value + duration }
+    Mysql2::Client.query_count.update { |value| value + 1 }
   end
   alias_method_chain :query, :timing
 end
@@ -22,15 +24,20 @@ module Glimpse
   module Views
     class Mysql2 < View
       def duration
-        ::Mysql2::Client.query_time
+        ::Mysql2::Client.query_time.value
       end
 
       def formatted_duration
-        "%.2fms" % (duration * 1000)
+        ms = duration * 1000
+        if ms >= 1000
+          "%.2fms" % ms
+        else
+          "%.0fms" % ms
+        end
       end
 
       def calls
-        ::Mysql2::Client.query_count
+        ::Mysql2::Client.query_count.value
       end
 
       def results
@@ -42,8 +49,8 @@ module Glimpse
       def setup_subscribers
         # Reset each counter when a new request starts
         before_request do
-          ::Mysql2::Client.query_time = 0
-          ::Mysql2::Client.query_count = 0
+          ::Mysql2::Client.query_time.value = 0
+          ::Mysql2::Client.query_count.value = 0
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: glimpse-mysql2
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,8 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-09 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: glimpse
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -27,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: atomic
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: Provide a glimpse into the MySQL queries made during your application's
   requests.
 email:
@@ -36,6 +68,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md