request-log-analyzer 1.3.1 → 1.3.2

data/bin/request-log-analyzer

@@ -51,6 +51,7 @@ begin
     command_line.option(:report_width, :default => terminal_width - 1)
 
     command_line.switch(:debug)
+    command_line.switch(:no_progress)
 
     command_line.minimum_parameters = 1
   end

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.1"
+  VERSION = "1.3.2"
 
   # 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/controller.rb

@@ -35,10 +35,11 @@ module RequestLogAnalyzer
       # Database command line options
       options[:database]       = arguments[:database] if arguments[:database]
       options[:reset_database] = arguments[:reset_database]
-      
       options[:debug]    = arguments[:debug]
       options[:dump]     = arguments[:dump]
-
+      options[:parse_strategy] = arguments[:parse_strategy]
+      options[:no_progress]    = arguments[:no_progress]
+      
       output_class = RequestLogAnalyzer::Output::const_get(arguments[:output])
       if arguments[:file]
         output_file = File.new(arguments[:file], "w+")
@@ -75,10 +76,8 @@ module RequestLogAnalyzer
       
       controller = Controller.new(RequestLogAnalyzer::Source::LogParser.new(file_format, options), options)
       #controller = Controller.new(RequestLogAnalyzer::Source::DatabaseLoader.new(file_format, options), options)
-
-      options[:parse_strategy] = arguments[:parse_strategy]
       
-      # register filters        
+      # register filters
       if arguments[:after] || arguments[:before]
         filter_options = {}
         filter_options[:after]  = DateTime.parse(arguments[:after])  
@@ -133,8 +132,9 @@ module RequestLogAnalyzer
       @source.warning = lambda { |type, message, lineno|  @aggregators.each { |agg| agg.warning(type, message, lineno) } } if @source
 
       # Handle progress messagess
-      @source.progress = lambda { |message, value| handle_progress(message, value) } if @source
+      @source.progress = lambda { |message, value| handle_progress(message, value) } if @source && !options[:no_progress]
       
+      # Handle source change messages
       @source.source_changes = lambda { |change, filename| handle_source_change(change, filename) } if @source
     end
     

data/lib/request_log_analyzer/source/log_parser.rb

@@ -51,7 +51,7 @@ module RequestLogAnalyzer::Source
     def each_request(options = {}, &block) # :yields: :request, request
       
       case @source_files
-      when IO;     
+      when IO
         puts "Parsing from the standard input. Press CTRL+C to finish." # FIXME: not here
         parse_stream(@source_files, options, &block) 
       when String
@@ -97,6 +97,7 @@ 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
@@ -110,6 +111,7 @@ module RequestLogAnalyzer::Source
       @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,8 +136,8 @@ module RequestLogAnalyzer::Source
     # <tt>options</tt>:: A hash of options that can be used by the parser.
     def parse_io(io, options = {}, &block) # :yields: request
       @current_lineno = 1
-      io.each_line do |line|
-        @progress_handler.call(:progress, io.pos) if @progress_handler && io.kind_of?(File)
+      while line = io.gets
+        @progress_handler.call(:progress, io.pos) if @progress_handler && @current_lineno % 127 == 0
         
         if request_data = file_format.parse_line(line) { |wt, message| warn(wt, message) }
           @parsed_lines += 1
@@ -152,7 +154,7 @@ module RequestLogAnalyzer::Source
     # Add a block to this method to install a progress handler while parsing.
     # <tt>proc</tt>:: The proc that will be called to handle progress update messages
     def progress=(proc)
-      @progress_handler = proc
+      @dormant_progress_handler = proc
     end
 
     # Add a block to this method to install a warning handler while parsing,

data/lib/request_log_analyzer/tracker.rb

@@ -57,16 +57,20 @@ module RequestLogAnalyzer::Tracker
     def should_update?(request)
       return false if options[:line_type] && !request.has_line_type?(options[:line_type])
       
-      if options[:if].kind_of?(Symbol)
-        return false unless request[options[:if]]
-      elsif options[:if].respond_to?(:call)
-        return false unless options[:if].call(request)
+      if options[:if]
+        if options[:if].kind_of?(Symbol)
+          return false unless request[options[:if]]
+        elsif options[:if].respond_to?(:call)
+          return false unless options[:if].call(request)
+        end
       end
       
-      if options[:unless].kind_of?(Symbol)
-        return false if request[options[:unless]]
-      elsif options[:unless].respond_to?(:call)
-        return false if options[:unless].call(request)
+      if options[:unless]
+        if options[:unless].kind_of?(Symbol)
+          return false if request[options[:unless]]
+        elsif options[:unless].respond_to?(:call)
+          return false if options[:unless].call(request)
+        end
       end
       
       return true

data/lib/request_log_analyzer/tracker/duration.rb

@@ -28,7 +28,9 @@ module RequestLogAnalyzer::Tracker
     def prepare
       raise "No duration field set up for category tracker #{self.inspect}" unless options[:duration]
       raise "No categorizer set up for duration tracker #{self.inspect}" unless options[:category]
-  
+
+      @categorizer  = options[:category].respond_to?(:call) ? options[:category] : lambda { |request| request[options[:category]] }
+      @durationizer = options[:duration].respond_to?(:call) ? options[:duration] : lambda { |request| request[options[:duration]] }
       @categories = {}
     end
 
@@ -49,15 +51,15 @@ module RequestLogAnalyzer::Tracker
           raise "Capture mismatch for multiple values in a request"
         end
       else
-        category = options[:category].respond_to?(:call) ? options[:category].call(request) : request[options[:category]]
-        duration = options[:duration].respond_to?(:call) ? options[:duration].call(request) : request[options[:duration]]
+        category = @categorizer.call(request)  # options[:category].respond_to?(:call) ? options[:category].call(request) : request[options[:category]]
+        duration = @durationizer.call(request) # options[:duration].respond_to?(:call) ? options[:duration].call(request) : request[options[:duration]]
   
         if duration.kind_of?(Float) && category.kind_of?(String)
           @categories[category] ||= {:hits => 0, :cumulative => 0.0, :min => duration, :max => duration }
           @categories[category][:hits] += 1
           @categories[category][:cumulative] += duration
           @categories[category][:min] = duration if duration < @categories[category][:min]
-          @categories[category][:max] = duration if duration > @categories[category][:max]   
+          @categories[category][:max] = duration if duration > @categories[category][:max]
         end
       end
     end

data/request-log-analyzer.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name    = "request-log-analyzer"
-  s.version = "1.3.1"
-  s.date    = "2009-09-12"
+  s.version = "1.3.2"
+  s.date    = "2009-09-13"
   
   s.rubyforge_project = 'r-l-a'
   

data/spec/unit/file_format/apache_format_spec.rb

@@ -70,7 +70,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
     end
     
     it "should read the correct values from a valid HTTP/1.0 access log line" do
-      @log_parser.parse_io(@sample_1) do |request|
+      @log_parser.parse_io(StringIO.new(@sample_1)) do |request|
         request[:remote_host].should  == '1.129.119.13'
         request[:timestamp].should    == 20090908075409
         request[:http_status].should  == 200
@@ -82,7 +82,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
     end
     
     it "should read the correct values from a valid 200 access log line" do
-      @log_parser.parse_io(@sample_2) do |request|
+      @log_parser.parse_io(StringIO.new(@sample_2)) do |request|
         request[:remote_host].should  == '1.82.235.29'
         request[:timestamp].should    == 20090908075405
         request[:http_status].should  == 200
@@ -122,7 +122,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
     end
 
     it "should read the correct values from a valid 404 access log line" do
-      @log_parser.parse_io(@sample_1) do |request|
+      @log_parser.parse_io(StringIO.new(@sample_1)) do |request|
         request[:remote_host].should  == '69.41.0.45'
         request[:timestamp].should    == 20090902120240
         request[:http_status].should  == 404
@@ -136,7 +136,7 @@ describe RequestLogAnalyzer::FileFormat::Apache do
     end
     
     it "should read the correct values from a valid 200 access log line" do
-      @log_parser.parse_io(@sample_2) do |request|
+      @log_parser.parse_io(StringIO.new(@sample_2)) do |request|
         request[:remote_host].should  == '10.0.1.1'
         request[:timestamp].should    == 20090902050833
         request[:http_status].should  == 200

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  version: 1.3.1
+  version: 1.3.2
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-12 00:00:00 +02:00
+date: 2009-09-13 00:00:00 +02:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency