rails_log_profiling 0.1.0.beta1 → 0.1.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7800e088ecfa2142aa4fad1f77da49da36df9600
-  data.tar.gz: abe57b18ab6d405b3a2a84d2bf867f041f0a5a4c
+  metadata.gz: d3012512b383e13d08eb6a013af5ee0ecdf7b82e
+  data.tar.gz: 0b82ba4ba1ef9932c8a9bffecfcb5ba97efda835
 SHA512:
-  metadata.gz: 14315a93ed0c74e6086edd7220e1fec2609a9841c7bc9bb8941d2187ad8be70dbac744a2e0adf4fe9ecdf29ea5b7f7618bdf12ded068d71add8fe894cfdeab2a
-  data.tar.gz: bb2ba48c71eb404926f8d1a3188b3f68c779bbbda564fe4fd2494529498dbb18727bfaa007eb8c885e36c8121611224ac6426fce39899e3b5b31d206041f7ae8
+  metadata.gz: aaad508e4cee7775e7282632f4e7e185459bbd10c25a98d8b393809cc062ad2c6b66c132e3e41c0c0b944e6e5f68ccc7ce565969e1cc2b7715d06ccd6f6b6a19
+  data.tar.gz: 41fd34dc7da2d30a0864dce28891e363342ac3adbd2d7cfcfe36d0c79f50bdae4a73841cf979349dfdbf87500164a1236b1b8bfcdd7978dbf3755f259c312d91

data/README.md

@@ -1,6 +1,7 @@
 # Rails::Log::Profiling
 
 ![Build Status](https://travis-ci.org/fukumone/rails_log_profiling.svg)
+[![Gem Version](https://badge.fury.io/rb/rails_log_profiling.svg)](http://badge.fury.io/rb/rails_log_profiling)
 
 Rails専用のパフォーマンスツール
  - クエリプロファイリング：クエリを降順、昇順に整理してログに出力
@@ -11,9 +12,9 @@ TODO:
   - Beta1
     - クエリプロファイリング機能追加
   - Beta2
-    - Viewプロファイル機能追加
     - メソッドの実行箇所検知機能追加
   - Beta3
+    - Viewプロファイル機能追加
     - Rails4.0、Rails4.1、Rails4.2、Rails5.0正式サポート
 
 ## Installation
@@ -27,11 +28,18 @@ $ gem install rails_log_profiling --pre
 - gemfileに追加
 
 ```
-gem 'rails_log_profiling', '~> 0.1.0.beta1', :group => "development"
+gem 'rails_log_profiling', '~> 0.1.0.beta2', :group => "development"
 ```
 
 ## Usage
-  Gemをインストールした状態でRails Serverを起動
+  Rails::Log::Profilingは初期の段階ではなにも行いません、動作させるには
+config/environments/development.rbに下記の設定を追加してください
+
+  ```:devlopment.rb
+  Rails::Log::Profiling.enable = true
+  ```
+
+  設定後、Rails Serverを起動
   log/以下にログファイルが作られ、記録されます
 
 ```
@@ -41,19 +49,18 @@ $ tail -f log/rails_log_profiling.log
   PostsController#index
 
   2件のクエリの検知
-  1:  Post Load (1.4ms)  SELECT `posts`.* FROM `posts`
 
-  2:  Article Load (0.8ms)  SELECT  `articles`.* FROM `articles` ORDER BY `articles`.`id` ASC LIMIT 1
-```
+  1:  Post Load (3.7ms)  SELECT `posts`.* FROM `posts`
+ Identify Query Location::
+ /Users/fukumone/private_repo/rails_test/app/views/posts/index.html.erb:16:in `_app_views_posts_index_html_erb___191904507552904544_70102088595360'
 
-## Configuration
-Rails::Log::Profilingは初期の段階ではなにも行いません、動作させるには
-config/environments/development.rbに下記の設定を追加してください
 
-```:devlopment.rb
-Rails::Log::Profiling.enable = true
+  2:  CurationType Load (1.4ms)  SELECT  `curation_types`.* FROM `curation_types` ORDER BY `curation_types`.`id` ASC LIMIT 1
+ Identify Query Location::
+ /Users/fukumone/private_repo/rails_test/app/controllers/posts_controller.rb:9:in `index'
 ```
 
+## Configuration
 Rails::Log::Profilingはオプションが用意されています
   - `Rails::Log::Profiling.enable`： true => Rails::Log::Profilingを有効にする
   - `Rails::Log::Profiling.sort_order`: クエリの並び順を指定する、降順はdesc、昇順はascと設定してください。初期設定はdescになっています

data/lib/rails/log/profiling/action_controller.rb

@@ -3,18 +3,16 @@ require 'action_controller'
 module ActionController
   class Base
     include Rails::Log::Profiling
-    before_action :controller_action_message
-    after_action :logger_execute
+    after_action :rails_query_profiling_logger_execute
 
     private
-      def controller_action_message
-        controller_name = params[:controller].split("_").map(&:capitalize).join
-        Rails::Log::Profiling.logger.info("\n \033[36m #{controller_name}Controller##{params[:action]}")
-      end
-
-      def logger_execute
-        Rails::Log::Profiling.logger.info("\n \033[36m" + Rails::Log::Profiling.sqls.count.to_s + "件のクエリの検知")
-        Rails::Log::Profiling::QueryProfiling.execute
+      def rails_query_profiling_logger_execute
+        unless Rails::Log::Profiling.sqls.empty?
+          controller_name = params[:controller].split("_").map(&:capitalize).join
+          Rails::Log::Profiling.logger.info("\033[36m #{controller_name}Controller##{params[:action]}")
+          Rails::Log::Profiling.logger.info("\n \033[36m" + Rails::Log::Profiling.sqls.count.to_s + "件のクエリの検知")
+          Rails::Log::Profiling::QueryProfiling.execute
+        end
       end
   end
 end

data/lib/rails/log/profiling/logger.rb

@@ -5,6 +5,7 @@ module Rails
         def self.run
           require 'fileutils'
           root_path = Rails.root.to_s
+          Rails::Log::Profiling.current_path = Regexp.quote(root_path)
           FileUtils.mkdir_p(root_path + '/log')
           log_file = root_path + '/log/rails_profiling.log'
           if File.exist?(log_file)

data/lib/rails/log/profiling/query_log_subscriber.rb

@@ -4,20 +4,21 @@ require "active_record/log_subscriber"
 module Rails::Log::Profiling
   class QueryLogSubscriber < ActiveRecord::LogSubscriber
     def sql(event)
+      locations = get_locations
+      return if locations.empty?
       payload = event.payload
 
       return if IGNORE_PAYLOAD_NAMES.include?(payload[:name])
 
       if ActiveRecord.version >= Gem::Version.new("5.0.0.beta")
-        ar_ver_5(event)
+        ar_ver_5(event, locations)
       else
-        ar_ver_4(event)
+        ar_ver_4(event, locations)
       end
     end
 
     private
-
-      def ar_ver_5(event)
+      def ar_ver_5(event, locations)
         payload = event.payload
         name  = "#{payload[:name]} (#{event.duration.round(1)}ms)"
         sql   = payload[:sql]
@@ -31,11 +32,11 @@ module Rails::Log::Profiling
         sql  = color(sql, sql_color(sql), true)
 
         if !name.match(/.*ActiveRecord::SchemaMigration.*/) && name.match(/.*Load.\(.*ms\).*/)
-          Rails::Log::Profiling.sqls << [ "#{event.duration.round(1)}".to_f, "  #{name}  #{sql}#{binds}"]
+          Rails::Log::Profiling.sqls << [ "#{event.duration.round(1)}".to_f, "  #{name}  #{sql}#{binds}\n#{locations}"]
         end
       end
 
-      def ar_ver_4(event)
+      def ar_ver_4(event, locations)
         payload = event.payload
         name  = '%s (%.1fms)' % [payload[:name], event.duration]
         sql   = payload[:sql].squeeze(' ')
@@ -59,8 +60,23 @@ module Rails::Log::Profiling
         end
 
         if !name.match(/.*ActiveRecord::SchemaMigration.*/) && name.match(/.*Load.\(.*ms\).*/)
-          Rails::Log::Profiling.sqls << [ "#{event.duration.round(1)}".to_f, "  #{name}  #{sql}#{binds}" ]
+          Rails::Log::Profiling.sqls << [ "#{event.duration.round(1)}".to_f, "  #{name}  #{sql}#{binds}\n #{locations}" ]
+        end
+      end
+
+      def get_locations
+        ans = ""
+        temp = true
+        caller.each do |val|
+          if val.match(Rails::Log::Profiling.current_path)
+            if temp
+              ans += " \033[36mIdentify Query Location:\033[0m\n"
+              temp = false
+            end
+            ans += " " + val + "\n"
+          end
         end
+        ans
       end
   end
 end

data/lib/rails/log/profiling/version.rb

@@ -1,7 +1,7 @@
 module Rails
   module Log
     module Profiling
-      VERSION = "0.1.0.beta1"
+      VERSION = "0.1.0.beta2"
     end
   end
 end

data/lib/rails_log_profiling.rb

@@ -21,6 +21,10 @@ module Rails
         "desc"
       end
 
+      config_accessor :current_path, instance_accessor: false do
+        ""
+      end
+
       if defined?(Rails)
         class Railtie < ::Rails::Railtie
           initializer "rails_log_profiling.configure_rails_initialization" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_log_profiling
 version: !ruby/object:Gem::Version
-  version: 0.1.0.beta1
+  version: 0.1.0.beta2
 platform: ruby
 authors:
 - fukumone
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-23 00:00:00.000000000 Z
+date: 2016-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler