wvanbergen-request-log-analyzer 1.3.6 → 1.3.7

data/lib/request_log_analyzer.rb

@@ -11,7 +11,7 @@ module RequestLogAnalyzer
   
   # The current version of request-log-analyzer.
   # This will be diplayed in output reports etc.
-  VERSION = "1.3.6"
+  VERSION = "1.3.7"
 
   # Loads constants in the RequestLogAnalyzer namespace using self.load_default_class_file(base, const)
   # <tt>const</tt>:: The constant that is not yet loaded in the RequestLogAnalyzer namespace. This should be passed as a string or symbol.

data/lib/request_log_analyzer/file_format/merb.rb

@@ -8,7 +8,7 @@ module RequestLogAnalyzer::FileFormat
     # ~ Started request handling: Fri Aug 29 11:10:23 +0200 2008
     line_definition :started do |line|
       line.header = true
-      # line.teaser = /Started/
+      line.teaser = /Started request handling\:/
       line.regexp = /Started request handling\:\ (.+)/
       line.captures << { :name => :timestamp, :type => :timestamp }
     end    
@@ -16,7 +16,7 @@ module RequestLogAnalyzer::FileFormat
     # ~ Params: {"action"=>"create", "controller"=>"session"}
     # ~ Params: {"_method"=>"delete", "authenticity_token"=>"[FILTERED]", "action"=>"d}
     line_definition :params do |line|
-      # line.teaser = /Params/
+      line.teaser = /Params\:\ /
       line.regexp = /Params\:\ (\{.+\})/
       line.captures << { :name => :params, :type => :eval, :provides => { 
             :namespace => :string, :controller => :string, :action => :string, :format => :string, :method => :string } }
@@ -25,6 +25,7 @@ module RequestLogAnalyzer::FileFormat
     # ~ {:dispatch_time=>0.006117, :after_filters_time=>6.1e-05, :before_filters_time=>0.000712, :action_time=>0.005833}
     line_definition :completed do |line|
       line.footer = true
+      # line.teaser = Regexp.new(Regexp.quote('~ {:'))
       line.regexp = /(\{.*\:dispatch_time\s*=>\s*\d+\.\d+.*\})/
       line.captures << { :name => :times_hash, :type => :eval, :provides => {
             :dispatch_time => :duration, :after_filters_time => :duration,

data/lib/request_log_analyzer/file_format/rails.rb

@@ -5,7 +5,7 @@ module RequestLogAnalyzer::FileFormat
     # Processing EmployeeController#index (for 123.123.123.123 at 2008-07-13 06:00:00) [GET]
     line_definition :processing do |line|
       line.header = true # this line is the first log line for a request 
-      # line.teaser = /Processing /
+      line.teaser = /Processing /
       line.regexp = /Processing ((?:\w+::)?\w+)#(\w+)(?: to (\w+))? \(for (\d+\.\d+\.\d+\.\d+) at (\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d)\) \[([A-Z]+)\]/
       line.captures << { :name => :controller, :type  => :string } \
                     << { :name => :action,     :type  => :string } \
@@ -15,9 +15,9 @@ module RequestLogAnalyzer::FileFormat
                     << { :name => :method,     :type  => :string }
     end
 
-    # Filter chain halted as [#<ActionController::Caching::Actions::ActionCacheFilter:0x2a999ad620 @check=nil, @options={:store_options=>{}, :layout=>nil, :cache_path=>#<Proc:0x0000002a999b8890@/app/controllers/cached_controller.rb:8>}>] rendered_or_redirected.    
+    # Filter chain halted as [#<ActionController::Caching::Actions::ActionCacheFilter:0x2a999ad620 @check=nil, @options={:store_options=>{}, :layout=>nil, :cache_path=>#<Proc:0x0000002a999b8890@/app/controllers/cached_controller.rb:8>}>] rendered_or_redirected.
     line_definition :cache_hit do |line|
-      line.regexp = /Filter chain halted as \[\#<ActionController::Caching::Actions::ActionCacheFilter:.+>\] rendered_or_redirected/
+      line.regexp = /Filter chain halted as \[\#<ActionController::Caching::Actions::ActionCacheFilter/
     end
   
     # RuntimeError (Cannot destroy employee):  /app/models/employee.rb:198:in `before_destroy' 
@@ -46,7 +46,7 @@ module RequestLogAnalyzer::FileFormat
     line_definition :completed do |line|
     
       line.footer = true
-      # line.teaser = /Completed in /
+      line.teaser = /Completed in /
       line.regexp = Regexp.new("(?:#{RAILS_21_COMPLETED}|#{RAILS_22_COMPLETED})")
     
       line.captures << { :name => :duration, :type => :duration, :unit => :sec } \
@@ -91,7 +91,7 @@ module RequestLogAnalyzer::FileFormat
     
       # Do not use DateTime.parse
       def convert_timestamp(value, definition)
-        value.gsub(/[^0-9]/, '')[0...14].to_i unless value.nil?
+        value.gsub(/[^0-9]/, '')[0...14].to_i
       end
     end
 

data/lib/request_log_analyzer/request.rb

@@ -9,10 +9,6 @@ module RequestLogAnalyzer
   # Request#every(field_name) returns all values corresponding to the given field name as array.
   class Request
   
-    def self.inherited(klass)
-      # klass.send(:include, Converters)
-    end
-  
     module Converters
 
       # Default converter function, which converts the parsed strings to a native Ruby type

data/lib/request_log_analyzer/source/log_parser.rb

@@ -94,21 +94,26 @@ module RequestLogAnalyzer::Source
     # <tt>options</tt>:: A Hash of options that will be pased to parse_io.
     def parse_file(file, options = {}, &block)
 
-      @progress_handler = @dormant_progress_handler
       @current_source = File.expand_path(file)
-      @progress_handler.call(:started, file)                  if @progress_handler
       @source_changes_handler.call(:started, @current_source) if @source_changes_handler
       
       if decompress_file?(file).empty?
+
+        @progress_handler = @dormant_progress_handler
+        @progress_handler.call(:started, file) if @progress_handler
+        
         File.open(file, 'r') { |f| parse_io(f, options, &block) }
+        
+        @progress_handler.call(:finished, file) if @progress_handler
+        @progress_handler = nil
       else
         IO.popen(decompress_file?(file), 'r') { |f| parse_io(f, options, &block) }
       end
       
       @source_changes_handler.call(:finished, @current_source) if @source_changes_handler
-      @progress_handler.call(:finished, file)                  if @progress_handler
+      
       @current_source = nil
-      @progress_handler = nil
+
     end
 
     # Parses an IO stream. It will simply call parse_io. This function does not support progress updates
@@ -134,7 +139,7 @@ module RequestLogAnalyzer::Source
     def parse_io(io, options = {}, &block) # :yields: request
       @current_lineno = 1
       while line = io.gets
-        @progress_handler.call(:progress, io.pos) if @progress_handler && (@current_lineno & 255 == 0)
+        @progress_handler.call(:progress, io.pos) if @progress_handler && @current_lineno % 255 == 0
         
         if request_data = file_format.parse_line(line) { |wt, message| warn(wt, message) }
           @parsed_lines += 1

data/request-log-analyzer.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = "request-log-analyzer"
-  s.version = "1.3.6"
-  s.date    = "2009-09-20"
+  s.version = "1.3.7"
+  s.date    = "2009-09-22"
   
   s.rubyforge_project = 'r-l-a'
   

data/spec/integration/command_line_usage_spec.rb

@@ -15,6 +15,12 @@ describe RequestLogAnalyzer, 'running from command line' do
     output.any? { |line| /^Parsed requests\:\s*4\s/ =~ line }.should be_true
   end
 
+  it "should find 2 requests when parsing a compressed file" do
+    output = run("#{log_fixture(:decompression, :tgz)}")
+    output.any? { |line| /^Parsed requests\:\s*2\s/ =~ line }.should be_true
+  end
+
+
   it "should skip 1 requests with a --select option" do
     output = run("#{log_fixture(:rails_1x)} --select controller PeopleController")
     output.any? { |line| /^Skipped requests\:\s*1\s/ =~ line }.should be_true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: wvanbergen-request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.3.6
+  version: 1.3.7
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-20 00:00:00 -07:00
+date: 2009-09-22 00:00:00 -07:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency