rorvswild 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f54f409b8f0d1dedb0891da5a680d7a701a67a2d
-  data.tar.gz: bb647ca3ce47cc27fd6279dd25fbabae7d48ab15
+  metadata.gz: ba08aa966ce2e82a89df73629d47a656d7616b84
+  data.tar.gz: 669ffa2a6ba1e8ed508e9ad50b395bedaec0caf2
 SHA512:
-  metadata.gz: af4176a3d8b8e48db393dfb0001c616184a98ca885163fb566f98bd089deac147eea471a372d0821d4120153088d0ec83af23007d69aad557e2f9d1d6b9ea185
-  data.tar.gz: 3b35e6030188581d2a8e239aa7163742665fd6401f38788f8046e62668fd79ba13858466254a22a2a32f631519f03562b721dcd92c52bb24daaf839f7b03066f
+  metadata.gz: 4e4d2da8c004d341bc9cd89aedefa78f18126d7da392745a91abd80cf87f81f2c4e73a3a64db0fc775a7cd53dc02ff7aeb706f776d1f45e6c0b146d985eeb0d6
+  data.tar.gz: 5945c84419fa4691d5eaeb619429b42415b32b065a62179cf50df9b2c453f6c30a52947847c9417b8d028ece5a00899c0fe5ca0bff5adc8179311e95ae94cca5

data/lib/rorvswild/version.rb

@@ -1,3 +1,3 @@
 class Rorvswild
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/rorvswild.rb

@@ -9,15 +9,17 @@ module RorVsWild
     def self.default_config
       {
         api_url: "http://www.rorvswild.com/api",
-        sql_threshold: 500
+        explain_sql_threshold: 500,
+        log_sql_threshold: 100,
       }
     end
 
-    attr_reader :api_url, :api_key, :app_id, :sql_threshold, :error, :request
+    attr_reader :api_url, :api_key, :app_id, :error, :request, :explain_sql_threshold, :log_sql_threshold
 
     def initialize(config)
       config = self.class.default_config.merge(config)
-      @sql_threshold = config[:sql_threshold]
+      @explain_sql_threshold = config[:explain_sql_threshold]
+      @log_sql_threshold = config[:log_sql_threshold]
       @api_url = config[:api_url]
       @api_key = config[:api_key]
       @app_id = config[:app_id]
@@ -53,14 +55,11 @@ module RorVsWild
       return if !queries || payload[:name] == "EXPLAIN".freeze
       runtime, sql, plan = compute_duration(start, finish), nil, nil
       file, line, method = extract_file_and_line_from_call_stack(caller)
-
-      if !file # I have no idea of the origin of the query, so at least we log the SQL.
-        file, line, method = ["Unknow", 0, "Unknow"]
-        sql = payload[:sql]
-      end
-
-      plan = explain(sql = payload[:sql], payload[:binds]) if runtime > sql_threshold
-      queries << {file: file, line: line, sql: sql, plan: plan, runtime: runtime}
+      # I can't figure out the exact location which triggered the query, so at least the SQL is logged.
+      sql, file, line, method = payload[:sql], "Unknow", 0, "Unknow" if !file
+      sql = payload[:sql] if runtime >= log_sql_threshold
+      plan = explain(payload[:sql], payload[:binds]) if runtime >= explain_sql_threshold
+      queries << {file: file, line: line, method: method, sql: sql, plan: plan, runtime: runtime}
     rescue => exception
       log_error(exception)
     end
@@ -116,15 +115,18 @@ module RorVsWild
     end
 
     def extract_file_and_line_from_call_stack(stack)
-      location = stack.find { |str| str.include?(Rails.root.to_s) } ||
-        stack.find { |str| !str.include?("/active_support/notifications/") }  # Origin of the call comes from a gem probably
-      return unless location # Ok I have no idea
+      return unless location = stack.find { |str| str.include?(Rails.root.to_s) }
       file, line, method = location.split(":")
+      method = cleanup_method_name(method)
       file.sub!(Rails.root.to_s, "")
+      [file, line, method]
+    end
+
+    def cleanup_method_name(method)
       method.sub!("block in ", "")
       method.sub!("in `", "")
       method.sub!("'", "")
-      [file, line, method]
+      method.index("_app_views_") == 0 ? nil : method
     end
 
     def compute_duration(start, finish)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rorvswild
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Alexis Bernard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler