request-log-analyzer 1.8.1 → 1.9.0

data/DESIGN.rdoc

@@ -38,4 +38,3 @@ into SQLite database Y. The Summarizer will output its reports.
 
 The output is pushed to a RequestLogAnalyzer::Output object, which takes care of the output.
 It can generate either ASCII, UTF8 or even HTML output.
-

data/README.rdoc

@@ -4,11 +4,11 @@ This is a simple command line tool to analyze request log files in various forma
 
 * Analyzes log files. Currently supports: Amazon S3, Apache, Delayed::Job, Merb, Mysql, PostgreSQL, Rack, Rails and more.
 * Combines multiple files and decompresses compressed files, which comes in handy if you are using logrotate.
-* Uses several metrics, including cumulative request time, mean request time, process blockers, database and rendering time, HTTP methods and statuses, Rails action cache statistics, etc.) (Sample output: http://wiki.github.com/wvanbergen/request-log-analyzer/sample-output)
+* Uses several metrics, including cumulative request time, mean request time, process blockers, database and rendering time, HTTP methods and statuses, Rails action cache statistics, etc.) (Sample output: http://github.com/wvanbergen/request-log-analyzer/wiki/sample-output)
 * Low memory footprint and reasonably fast, so it is safe to run on a production server.
 * MIT licensed
 
-See the project wiki at http://wiki.github.com/wvanbergen/request-log-analyzer for documentation and additional information.
+See the project wiki at http://github.com/wvanbergen/request-log-analyzer/wiki for documentation and additional information.
 
 == Installation & basic usage
 
@@ -22,7 +22,7 @@ request-log-analyzer like this:
 
   $ request-log-analyzer log/production.log
 
-For more details, other file formats, and available command line options, see the project's wiki at http://wiki.github.com/wvanbergen/request-log-analyzer
+For more details, other file formats, and available command line options, see the project's wiki at http://github.com/wvanbergen/request-log-analyzer/wiki
 
 == Additional information
 
@@ -33,6 +33,7 @@ Do you have a rails application that is not performing as it should? If you need
 an expert to analyze your application, feel free to contact either Willem van
 Bergen (willem@railsdoctors.com) or Bart ten Brinke (bart@railsdoctors.com).
 
-* Project wiki at GitHub: http://wiki.github.com/wvanbergen/request-log-analyzer
+* Project wiki at GitHub: http://github.com/wvanbergen/request-log-analyzer/wiki
+* Issue tracker at GitHub: http://github.com/wvanbergen/request-log-analyzer/issues
 * railsdoctors homepage: http://railsdoctors.com
-* wvanbergen's blog posts: http://techblog.floorplanner.com/tag/request-log-analyzer
+* wvanbergen's blog posts: http://techblog.floorplanner.com/tag/request-log-analyzer

data/lib/request_log_analyzer.rb

@@ -13,7 +13,7 @@ module RequestLogAnalyzer
 
   # The current version of request-log-analyzer.
   # Do not change the value by hand; it will be updated automatically by the gem release script.
-  VERSION = "1.8.1"
+  VERSION = "1.9.0"
 
 
   autoload :Controller,     'request_log_analyzer/controller'

data/lib/request_log_analyzer/file_format.rb

@@ -10,6 +10,7 @@ module RequestLogAnalyzer::FileFormat
   autoload :Postgresql,       'request_log_analyzer/file_format/postgresql'
   autoload :DelayedJob,       'request_log_analyzer/file_format/delayed_job'
   autoload :DelayedJob2,      'request_log_analyzer/file_format/delayed_job2'
+  autoload :DelayedJob21,     'request_log_analyzer/file_format/delayed_job21'
   autoload :Apache,           'request_log_analyzer/file_format/apache'
   autoload :AmazonS3,         'request_log_analyzer/file_format/amazon_s3'
 

data/lib/request_log_analyzer/file_format/delayed_job2.rb

@@ -1,6 +1,6 @@
 module RequestLogAnalyzer::FileFormat
 
-  # The DelayedJob2 file format parsed log files that are created by DelayedJob 2.0 or higher.
+  # The DelayedJob2 file format parsed log files that are created by DelayedJob 2.0.
   # By default, the log file can be found in RAILS_ROOT/log/delayed_job.log
   class DelayedJob2 < Base
     

data/lib/request_log_analyzer/file_format/delayed_job21.rb

@@ -0,0 +1,39 @@
+module RequestLogAnalyzer::FileFormat
+
+  # The DelayedJob21 file format parsed log files that are created by DelayedJob 2.1 or higher.
+  # By default, the log file can be found in RAILS_ROOT/log/delayed_job.log
+  class DelayedJob21 < Base
+    
+    extend CommonRegularExpressions
+    
+    line_definition :job_lock do |line|
+      line.header = true
+      line.regexp = /(#{timestamp('%Y-%m-%dT%H:%M:%S%z')}): \[Worker\(\w+ host:(\S+) pid:(\d+)\)\] acquired lock on (\S+)/
+      
+      line.capture(:timestamp).as(:timestamp)
+      line.capture(:host)
+      line.capture(:pid).as(:integer)
+      line.capture(:job)
+    end
+    
+    line_definition :job_completed do |line|
+      line.footer = true
+      line.regexp = /(#{timestamp('%Y-%m-%dT%H:%M:%S%z')}): \[Worker\(\w+ host:(\S+) pid:(\d+)\)\] (\S+) completed after (\d+\.\d+)/
+      line.capture(:timestamp).as(:timestamp)
+      line.capture(:host)
+      line.capture(:pid).as(:integer)
+      line.capture(:job)
+      line.capture(:duration).as(:duration, :unit => :sec)
+    end
+    
+    report do |analyze|
+      analyze.timespan
+      analyze.hourly_spread
+
+      analyze.frequency :job, :line_type => :job_completed, :title => "Completed jobs"
+      #analyze.frequency :job, :if => lambda { |request| request[:attempts] ==  1 }, :title => "Failed jobs"
+      
+      analyze.duration :duration, :category => :job, :line_type => :job_completed, :title => "Job duration"
+    end
+  end
+end

data/lib/request_log_analyzer/tracker/duration.rb

@@ -25,6 +25,13 @@ module RequestLogAnalyzer::Tracker
     def prepare
       options[:value] = options[:duration] if options[:duration]
       super
+      
+      @number_of_buckets = options[:number_of_buckets] || 1000
+      @min_bucket_value  = options[:min_bucket_value] ? options[:min_bucket_value].to_f : 0.0001
+      @max_bucket_value  = options[:max_bucket_value] ? options[:max_bucket_value].to_f : 1000
+
+      # precalculate the bucket size
+      @bucket_size = (Math.log(@max_bucket_value) - Math.log(@min_bucket_value)) / @number_of_buckets.to_f
     end
 
     # Display a duration

data/lib/request_log_analyzer/tracker/numeric_value.rb

@@ -1,5 +1,5 @@
 module RequestLogAnalyzer::Tracker
-  
+
   class NumericValue < Base
 
     attr_reader :categories
@@ -8,7 +8,7 @@ module RequestLogAnalyzer::Tracker
     # options are set that are used to extract and categorize the values during
     # parsing. Two lambda procedures are created for these tasks
     def prepare
-      
+
       raise "No value field set up for numeric tracker #{self.inspect}" unless options[:value]
       raise "No categorizer set up for numeric tracker #{self.inspect}" unless options[:category]
 
@@ -16,15 +16,22 @@ module RequestLogAnalyzer::Tracker
         @categorizer = create_lambda(options[:category])
         @valueizer   = create_lambda(options[:value])
       end
+      
+      @number_of_buckets = options[:number_of_buckets] || 1000
+      @min_bucket_value  = options[:min_bucket_value] ? options[:min_bucket_value].to_f : 0.000001
+      @max_bucket_value  = options[:max_bucket_value] ? options[:max_bucket_value].to_f : 1_000_000_000
+
+      # precalculate the bucket size
+      @bucket_size = (Math.log(@max_bucket_value) - Math.log(@min_bucket_value)) / @number_of_buckets.to_f
 
       @categories = {}
     end
 
     # Get the value information from the request and store it in the respective categories.
     #
-    # If a request can contain multiple usable values for this tracker, the :multiple option 
+    # If a request can contain multiple usable values for this tracker, the :multiple option
     # should be set to true. In this case, all the values and respective categories will be
-    # read from the request using the #every method from the fields given in the :value and 
+    # read from the request using the #every method from the fields given in the :value and
     # :category option.
     #
     # If the request contains only one suitable value and the :multiple is not set, it will
@@ -38,11 +45,11 @@ module RequestLogAnalyzer::Tracker
         found_categories = request.every(options[:category])
         found_values     = request.every(options[:value])
         raise "Capture mismatch for multiple values in a request" unless found_categories.length == found_values.length
-        
-        found_categories.each_with_index do |cat, index| 
+
+        found_categories.each_with_index do |cat, index|
           update_statistics(cat, found_values[index]) if cat && found_values[index].kind_of?(Numeric)
         end
-        
+
       else
         category = @categorizer.call(request)
         value    = @valueizer.call(request)
@@ -90,7 +97,7 @@ module RequestLogAnalyzer::Tracker
       sortings.each do |sorting|
         report_table(output, sorting, :title => "#{title} - by #{sorting}")
       end
-      
+
       if options[:total]
         output.puts
         output.puts "#{output.colorize(title, :white, :bold)} - total: " + output.colorize(display_value(sum_overall), :brown, :bold)
@@ -116,13 +123,109 @@ module RequestLogAnalyzer::Tracker
       return nil if @categories.empty?
       @categories
     end
+
+
+    # Returns the bucket index for a value
+    def bucket_index(value)
+      return 0 if value < @min_bucket_value
+      return @number_of_buckets - 1 if value >= @max_bucket_value
+
+      ((Math.log(value) - Math.log(@min_bucket_value)) / @bucket_size).floor
+    end
+
+    # Returns the lower value of a bucket given its index
+    def bucket_lower_bound(index)
+      Math.exp((index * @bucket_size) + Math.log(@min_bucket_value))
+    end
+
+    # Returns the upper value of a bucket given its index
+    def bucket_upper_bound(index)
+      bucket_lower_bound(index + 1)
+    end
+
+    # Returns the average of the lower and upper bound of the bucket.
+    def bucket_average_value(index)
+      (bucket_lower_bound(index) + bucket_upper_bound(index)) / 2
+    end
+
+    # Returns a single value representing a bucket.
+    def bucket_value(index, type = nil)
+      case type
+      when :begin, :start, :lower, :lower_bound; bucket_lower_bound(index)
+      when :end, :finish, :upper, :upper_bound;  bucket_upper_bound(index)
+      else bucket_average_value(index)
+      end
+    end
+
+    # Returns the range of values for a bucket.
+    def bucket_interval(index)
+      Range.new(bucket_lower_bound(index), bucket_upper_bound(index), true)
+    end
+
+    # Records a hit on a bucket that includes the given value.
+    def bucketize(category, value)
+      @categories[category][:buckets][bucket_index(value)] += 1
+    end
+
+    # Returns the upper bound value that would include x% of the hits.
+    def percentile_index(category, x, inclusive = false)
+      total_encountered = 0
+      @categories[category][:buckets].each_with_index do |count, index|
+        total_encountered += count
+        percentage = ((total_encountered.to_f / hits(category).to_f) * 100).floor
+        return index if (inclusive && percentage >= x) || (!inclusive && percentage > x)
+      end
+    end
+
+    def percentile_indices(category, start, finish)
+      result = [nil, nil]
+      total_encountered = 0
+      @categories[category][:buckets].each_with_index do |count, index|
+        total_encountered += count
+        percentage = ((total_encountered.to_f / hits(category).to_f) * 100).floor
+        if !result[0] && percentage > start
+          result[0] = index
+        elsif !result[1] && percentage >= finish
+          result[1] = index
+          return result
+        end
+      end
+    end
+
+    def percentile(category, x, type = nil)
+      bucket_value(percentile_index(category, x, type == :upper), type)
+    end
+    
     
+    def median(category)
+      percentile(category, 50, :average)
+    end
+
+    # Returns a percentile interval, i.e. the lower bound and the upper bound of the values
+    # that represent the x%-interval for the bucketized dataset.
+    #
+    # A 90% interval means that 5% of the values would have been lower than the lower bound and
+    # 5% would have been higher than the upper bound, leaving 90% of the values within the bounds.
+    # You can also provide a Range to specify the lower bound and upper bound percentages (e.g. 5..95).
+    def percentile_interval(category, x)
+      case x
+      when Range
+        lower, upper = percentile_indices(category, x.begin, x.end)
+        Range.new(bucket_lower_bound(lower), bucket_upper_bound(upper))
+      when Numeric
+        percentile_interval(category, Range.new((100 - x) / 2, (100 - (100 - x) / 2)))
+      else 
+        raise 'What does it mean?'
+      end
+    end
 
-    # Update sthe running calculation of statistics with the newly found numeric value.
+    # Update the running calculation of statistics with the newly found numeric value.
     # <tt>category</tt>:: The category for which to update the running statistics calculations
     # <tt>number</tt>:: The numeric value to update the calculations with.
     def update_statistics(category, number)
-      @categories[category] ||= {:hits => 0, :sum => 0, :mean => 0.0, :sum_of_squares => 0.0, :min => number, :max => number }
+      @categories[category] ||= { :hits => 0, :sum => 0, :mean => 0.0, :sum_of_squares => 0.0, :min => number, :max => number, 
+                                  :buckets => Array.new(@number_of_buckets, 0) }
+      
       delta = number - @categories[category][:mean]
 
       @categories[category][:hits]           += 1
@@ -131,6 +234,8 @@ module RequestLogAnalyzer::Tracker
       @categories[category][:sum]            += number
       @categories[category][:min]             = number if number < @categories[category][:min]
       @categories[category][:max]             = number if number > @categories[category][:max]
+
+      bucketize(category, number)
     end
 
     # Get the number of hits of a specific category.
@@ -210,14 +315,16 @@ module RequestLogAnalyzer::Tracker
         {:title => 'Mean',   :align => :right, :highlight => (options[:highlight] == :mean),   :min_width => 6},
         {:title => 'StdDev', :align => :right, :highlight => (options[:highlight] == :stddev), :min_width => 6},
         {:title => 'Min',    :align => :right, :highlight => (options[:highlight] == :min),    :min_width => 6},
-        {:title => 'Max',    :align => :right, :highlight => (options[:highlight] == :max),    :min_width => 6}
+        {:title => 'Max',    :align => :right, :highlight => (options[:highlight] == :max),    :min_width => 6},
+        {:title => '95 %tile',    :align => :right, :highlight => (options[:highlight] == :percentile_interval),  :min_width => 11}
       ]
     end
 
     # Returns a row of statistics information for a report table, given a category
     def statistics_row(cat)
       [cat, hits(cat), display_value(sum(cat)), display_value(mean(cat)), display_value(stddev(cat)),
-                display_value(min(cat)), display_value(max(cat))]
+                display_value(min(cat)), display_value(max(cat)), 
+                display_value(percentile_interval(cat, 95).begin) + '-' + display_value(percentile_interval(cat, 95).end) ]
     end
   end
 end

data/lib/request_log_analyzer/tracker/traffic.rb

@@ -16,6 +16,13 @@ module RequestLogAnalyzer::Tracker
       options[:value] = options[:traffic] if options[:traffic]
       options[:total] = true
       super
+      
+      @number_of_buckets = options[:number_of_buckets] || 1000
+      @min_bucket_value  = options[:min_bucket_value] ? options[:min_bucket_value].to_f : 1
+      @max_bucket_value  = options[:max_bucket_value] ? options[:max_bucket_value].to_f : 1000_000_000_000
+
+      # precalculate the bucket size
+      @bucket_size = (Math.log(@max_bucket_value) - Math.log(@min_bucket_value)) / @number_of_buckets.to_f
     end
 
     # Formats the traffic number using x B/kB/MB/GB etc notation

data/request-log-analyzer.gemspec

@@ -2,8 +2,8 @@ Gem::Specification.new do |s|
   s.name    = "request-log-analyzer"
   
   # Do not set the version and date field manually, this is done by the release script
-  s.version = "1.8.1"
-  s.date    = "2010-08-31"
+  s.version = "1.9.0"
+  s.date    = "2010-09-26"
 
   s.rubyforge_project = 'r-l-a'
 
@@ -43,6 +43,6 @@ Gem::Specification.new do |s|
 
   # The files and test_files directives are set automatically by the release script.
   # Do not change them by hand, but make sure to add the files to the git repository.
-  s.files      = %w(spec/unit/file_format/delayed_job_format_spec.rb spec/fixtures/rails_unordered.log spec/unit/filter/anonymize_filter_spec.rb lib/request_log_analyzer/output/fancy_html.rb README.rdoc lib/cli/progressbar.rb spec/fixtures/rails.db lib/request_log_analyzer/file_format/rails_development.rb spec/fixtures/rails_22.log spec/unit/file_format/delayed_job2_format_spec.rb spec/fixtures/test_order.log spec/fixtures/header_and_footer.log lib/mixins/gets_memory_protection.rb spec/fixtures/decompression.log spec/fixtures/rails_1x.log lib/request_log_analyzer/file_format/apache.rb lib/request_log_analyzer/output.rb lib/request_log_analyzer/tracker/numeric_value.rb spec/unit/file_format/line_definition_spec.rb spec/unit/request_spec.rb spec/unit/filter/filter_spec.rb spec/unit/aggregator/summarizer_spec.rb lib/request_log_analyzer/file_format/rails.rb spec/database.yml spec/unit/tracker/numeric_value_tracker_spec.rb spec/spec_helper.rb lib/request_log_analyzer/database/base.rb spec/unit/aggregator/database_inserter_spec.rb spec/fixtures/decompression.log.bz2 spec/unit/database/connection_spec.rb spec/fixtures/oink_22.log spec/fixtures/sinatra.log lib/request_log_analyzer/database/warning.rb spec/fixtures/merb_prefixed.log spec/unit/file_format/postgresql_format_spec.rb lib/request_log_analyzer/filter/timespan.rb spec/fixtures/rails_22_cached.log lib/request_log_analyzer/tracker/traffic.rb spec/unit/file_format/format_autodetection_spec.rb lib/request_log_analyzer/filter/field.rb lib/request_log_analyzer/file_format/delayed_job.rb lib/request_log_analyzer/file_format/merb.rb lib/request_log_analyzer/file_format/oink.rb lib/request_log_analyzer/filter/anonymize.rb lib/request_log_analyzer/file_format/amazon_s3.rb LICENSE lib/request_log_analyzer/file_format.rb lib/cli/database_console.rb spec/integration/mailer_spec.rb spec/fixtures/merb.log lib/request_log_analyzer/line_definition.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/mailer_spec.rb spec/fixtures/postgresql.log spec/lib/mocks.rb lib/request_log_analyzer/tracker/hourly_spread.rb spec/unit/file_format/rails3_format_spec.rb spec/fixtures/syslog_1x.log lib/request_log_analyzer/source.rb lib/request_log_analyzer/file_format/rails3.rb spec/unit/controller/log_processor_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/filter/field_filter_spec.rb DESIGN.rdoc lib/request_log_analyzer/log_processor.rb spec/fixtures/multiple_files_1.log spec/unit/source/log_parser_spec.rb spec/fixtures/decompression.tar.gz spec/unit/database/base_class_spec.rb lib/request_log_analyzer/aggregator/database_inserter.rb lib/request_log_analyzer/database/connection.rb lib/request_log_analyzer/aggregator.rb lib/request_log_analyzer/database.rb spec/unit/file_format/rails_format_spec.rb lib/request_log_analyzer/source/database_loader.rb lib/request_log_analyzer/output/fixed_width.rb spec/integration/command_line_usage_spec.rb tasks/request_log_analyzer.rake lib/request_log_analyzer/tracker/duration.rb spec/fixtures/test_language_combined.log bin/request-log-analyzer lib/request_log_analyzer/tracker.rb tasks/github-gem.rake lib/cli/command_line_arguments.rb lib/request_log_analyzer.rb .gitignore lib/request_log_analyzer/output/html.rb lib/request_log_analyzer/database/request.rb lib/cli/database_console_init.rb lib/request_log_analyzer/database/source.rb spec/unit/file_format/amazon_s3_format_spec.rb lib/request_log_analyzer/filter.rb spec/fixtures/apache_combined.log spec/unit/tracker/duration_tracker_spec.rb spec/fixtures/test_file_format.log lib/request_log_analyzer/aggregator/summarizer.rb spec/fixtures/oink_22_failure.log spec/unit/filter/timespan_filter_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/file_format_api_spec.rb lib/request_log_analyzer/file_format/delayed_job2.rb spec/unit/file_format/rack_format_spec.rb spec/unit/file_format/mysql_format_spec.rb lib/request_log_analyzer/file_format/mysql.rb spec/fixtures/decompression.log.gz lib/request_log_analyzer/tracker/frequency.rb request-log-analyzer.gemspec spec/fixtures/apache_common.log Rakefile spec/unit/tracker/traffic_tracker_spec.rb lib/request_log_analyzer/file_format/postgresql.rb lib/request_log_analyzer/tracker/timespan.rb spec/lib/macros.rb spec/integration/scout_spec.rb spec/unit/controller/controller_spec.rb lib/request_log_analyzer/mailer.rb lib/cli/tools.rb spec/unit/tracker/timespan_tracker_spec.rb spec/lib/testing_format.rb spec/lib/matchers.rb lib/request_log_analyzer/controller.rb spec/unit/tracker/tracker_api_spec.rb lib/request_log_analyzer/request.rb spec/unit/file_format/oink_format_spec.rb spec/fixtures/multiple_files_2.log spec/unit/database/database_spec.rb spec/fixtures/decompression.log.zip spec/fixtures/decompression.tgz lib/request_log_analyzer/file_format/rack.rb spec/integration/munin_plugins_rails_spec.rb spec/fixtures/mysql_slow_query.log spec/lib/helpers.rb lib/request_log_analyzer/source/log_parser.rb lib/request_log_analyzer/aggregator/echo.rb spec/unit/file_format/apache_format_spec.rb)
-  s.test_files = %w(spec/unit/file_format/delayed_job_format_spec.rb spec/unit/filter/anonymize_filter_spec.rb spec/unit/file_format/delayed_job2_format_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/request_spec.rb spec/unit/filter/filter_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/tracker/numeric_value_tracker_spec.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/database/connection_spec.rb spec/unit/file_format/postgresql_format_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/integration/mailer_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/mailer_spec.rb spec/unit/file_format/rails3_format_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/database/base_class_spec.rb spec/unit/file_format/rails_format_spec.rb spec/integration/command_line_usage_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/rack_format_spec.rb spec/unit/file_format/mysql_format_spec.rb spec/unit/tracker/traffic_tracker_spec.rb spec/integration/scout_spec.rb spec/unit/controller/controller_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/file_format/oink_format_spec.rb spec/unit/database/database_spec.rb spec/integration/munin_plugins_rails_spec.rb spec/unit/file_format/apache_format_spec.rb)
+  s.files      = %w(.gitignore DESIGN.rdoc LICENSE README.rdoc Rakefile bin/request-log-analyzer lib/cli/command_line_arguments.rb lib/cli/database_console.rb lib/cli/database_console_init.rb lib/cli/progressbar.rb lib/cli/tools.rb lib/mixins/gets_memory_protection.rb lib/request_log_analyzer.rb lib/request_log_analyzer/aggregator.rb lib/request_log_analyzer/aggregator/database_inserter.rb lib/request_log_analyzer/aggregator/echo.rb lib/request_log_analyzer/aggregator/summarizer.rb lib/request_log_analyzer/controller.rb lib/request_log_analyzer/database.rb lib/request_log_analyzer/database/base.rb lib/request_log_analyzer/database/connection.rb lib/request_log_analyzer/database/request.rb lib/request_log_analyzer/database/source.rb lib/request_log_analyzer/database/warning.rb lib/request_log_analyzer/file_format.rb lib/request_log_analyzer/file_format/amazon_s3.rb lib/request_log_analyzer/file_format/apache.rb lib/request_log_analyzer/file_format/delayed_job.rb lib/request_log_analyzer/file_format/delayed_job2.rb lib/request_log_analyzer/file_format/delayed_job21.rb lib/request_log_analyzer/file_format/merb.rb lib/request_log_analyzer/file_format/mysql.rb lib/request_log_analyzer/file_format/oink.rb lib/request_log_analyzer/file_format/postgresql.rb lib/request_log_analyzer/file_format/rack.rb lib/request_log_analyzer/file_format/rails.rb lib/request_log_analyzer/file_format/rails3.rb lib/request_log_analyzer/file_format/rails_development.rb lib/request_log_analyzer/filter.rb lib/request_log_analyzer/filter/anonymize.rb lib/request_log_analyzer/filter/field.rb lib/request_log_analyzer/filter/timespan.rb lib/request_log_analyzer/line_definition.rb lib/request_log_analyzer/log_processor.rb lib/request_log_analyzer/mailer.rb lib/request_log_analyzer/output.rb lib/request_log_analyzer/output/fancy_html.rb lib/request_log_analyzer/output/fixed_width.rb lib/request_log_analyzer/output/html.rb lib/request_log_analyzer/request.rb lib/request_log_analyzer/source.rb lib/request_log_analyzer/source/database_loader.rb lib/request_log_analyzer/source/log_parser.rb lib/request_log_analyzer/tracker.rb lib/request_log_analyzer/tracker/duration.rb lib/request_log_analyzer/tracker/frequency.rb lib/request_log_analyzer/tracker/hourly_spread.rb lib/request_log_analyzer/tracker/numeric_value.rb lib/request_log_analyzer/tracker/timespan.rb lib/request_log_analyzer/tracker/traffic.rb request-log-analyzer.gemspec spec/database.yml spec/fixtures/apache_combined.log spec/fixtures/apache_common.log spec/fixtures/decompression.log spec/fixtures/decompression.log.bz2 spec/fixtures/decompression.log.gz spec/fixtures/decompression.log.zip spec/fixtures/decompression.tar.gz spec/fixtures/decompression.tgz spec/fixtures/header_and_footer.log spec/fixtures/merb.log spec/fixtures/merb_prefixed.log spec/fixtures/multiple_files_1.log spec/fixtures/multiple_files_2.log spec/fixtures/mysql_slow_query.log spec/fixtures/oink_22.log spec/fixtures/oink_22_failure.log spec/fixtures/postgresql.log spec/fixtures/rails.db spec/fixtures/rails_1x.log spec/fixtures/rails_22.log spec/fixtures/rails_22_cached.log spec/fixtures/rails_unordered.log spec/fixtures/sinatra.log spec/fixtures/syslog_1x.log spec/fixtures/test_file_format.log spec/fixtures/test_language_combined.log spec/fixtures/test_order.log spec/integration/command_line_usage_spec.rb spec/integration/mailer_spec.rb spec/integration/munin_plugins_rails_spec.rb spec/integration/scout_spec.rb spec/lib/helpers.rb spec/lib/macros.rb spec/lib/matchers.rb spec/lib/mocks.rb spec/lib/testing_format.rb spec/spec_helper.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/controller/controller_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/database/base_class_spec.rb spec/unit/database/connection_spec.rb spec/unit/database/database_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/file_format/apache_format_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/unit/file_format/delayed_job21_format_spec.rb spec/unit/file_format/delayed_job2_format_spec.rb spec/unit/file_format/delayed_job_format_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/mysql_format_spec.rb spec/unit/file_format/oink_format_spec.rb spec/unit/file_format/postgresql_format_spec.rb spec/unit/file_format/rack_format_spec.rb spec/unit/file_format/rails3_format_spec.rb spec/unit/file_format/rails_format_spec.rb spec/unit/filter/anonymize_filter_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/filter/filter_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/mailer_spec.rb spec/unit/request_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/tracker/numeric_value_tracker_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/traffic_tracker_spec.rb tasks/github-gem.rake tasks/request_log_analyzer.rake)
+  s.test_files = %w(spec/integration/command_line_usage_spec.rb spec/integration/mailer_spec.rb spec/integration/munin_plugins_rails_spec.rb spec/integration/scout_spec.rb spec/unit/aggregator/database_inserter_spec.rb spec/unit/aggregator/summarizer_spec.rb spec/unit/controller/controller_spec.rb spec/unit/controller/log_processor_spec.rb spec/unit/database/base_class_spec.rb spec/unit/database/connection_spec.rb spec/unit/database/database_spec.rb spec/unit/file_format/amazon_s3_format_spec.rb spec/unit/file_format/apache_format_spec.rb spec/unit/file_format/common_regular_expressions_spec.rb spec/unit/file_format/delayed_job21_format_spec.rb spec/unit/file_format/delayed_job2_format_spec.rb spec/unit/file_format/delayed_job_format_spec.rb spec/unit/file_format/file_format_api_spec.rb spec/unit/file_format/format_autodetection_spec.rb spec/unit/file_format/line_definition_spec.rb spec/unit/file_format/merb_format_spec.rb spec/unit/file_format/mysql_format_spec.rb spec/unit/file_format/oink_format_spec.rb spec/unit/file_format/postgresql_format_spec.rb spec/unit/file_format/rack_format_spec.rb spec/unit/file_format/rails3_format_spec.rb spec/unit/file_format/rails_format_spec.rb spec/unit/filter/anonymize_filter_spec.rb spec/unit/filter/field_filter_spec.rb spec/unit/filter/filter_spec.rb spec/unit/filter/timespan_filter_spec.rb spec/unit/mailer_spec.rb spec/unit/request_spec.rb spec/unit/source/log_parser_spec.rb spec/unit/tracker/duration_tracker_spec.rb spec/unit/tracker/frequency_tracker_spec.rb spec/unit/tracker/hourly_spread_spec.rb spec/unit/tracker/numeric_value_tracker_spec.rb spec/unit/tracker/timespan_tracker_spec.rb spec/unit/tracker/tracker_api_spec.rb spec/unit/tracker/traffic_tracker_spec.rb)
 end

data/spec/integration/mailer_spec.rb

@@ -32,7 +32,7 @@ describe RequestLogAnalyzer, 'running mailer integration' do
     find_string_in_file("From: Request-log-analyzer reporter <contact@railsdoctors.com>", @log_file).should_not be_nil
     find_string_in_file("Subject: Request log analyzer report - generated on", @log_file).should_not be_nil
     find_string_in_file("Request summary", @log_file).should_not be_nil
-    find_string_in_file("PeopleController#show.html [ |    1 |  0.29s |  0.29s |  0.00s |  0.29s |  0.29s", @log_file).should_not be_nil
+    find_string_in_file("PeopleControll |    1 |  0.04s |  0.04s |  0.00s |  0.04s |  0.04s | 0.04s-0.04s", @log_file).should_not be_nil
   end
   
   it "should allow a custom mail subject" do
@@ -66,7 +66,7 @@ describe RequestLogAnalyzer, 'running mailer integration' do
     find_string_in_file("To: <root@localhost>", @log_file).should_not be_nil
     find_string_in_file("From: Request-log-analyzer reporter <contact@railsdoctors.com>", @log_file).should_not be_nil
     find_string_in_file('<h1>Request-log-analyzer summary report</h1>', @log_file).should_not be_nil
-    find_string_in_file('<td class="alt">0.29s</td></tr><tr><td>DashboardController#index.html [GET]</td>', @log_file).should_not be_nil
+    find_string_in_file('<td class="alt">0.29s-0.30s</td></tr><tr><td>DashboardController#index.html [GET]</td>', @log_file).should_not be_nil
   end
 end
 
@@ -94,7 +94,7 @@ class Mailtrap
     @port = port
     @once = once
     @msgfile = msgfile
-
+    
     File.open( @msgfile, "a" ) do |file|
       file.puts "\n* Mailtrap started at #{@host}:#{port}\n"
     end

data/spec/unit/file_format/delayed_job21_format_spec.rb

@@ -0,0 +1,54 @@
+require 'spec_helper'
+
+describe RequestLogAnalyzer::FileFormat::DelayedJob do
+
+  it "should be a valid file format" do
+    RequestLogAnalyzer::FileFormat.load(:delayed_job).should be_valid
+  end
+
+  describe '#parse_line' do
+    
+    before(:each) do
+      @file_format = RequestLogAnalyzer::FileFormat.load(:delayed_job21)
+    end
+
+    it "should parse a :job_lock line correctly" do
+      line = "2010-05-17T17:37:34+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob"
+      @file_format.should parse_line(line).as(:job_lock).and_capture(:timestamp => 20100517173734,
+                                    :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888)
+    end
+
+    it "should parse a :job_completed line correctly" do
+      line = '2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob completed after 1.0676'
+      @file_format.should parse_line(line).as(:job_completed).and_capture(:timestamp => 20100517173735,
+                                    :duration => 1.0676, :host => 'hostname.co.uk', :pid => 11888, :job => 'S3FileJob')
+    end
+  end
+  
+  describe '#parse_io' do
+    before(:each) do
+      @log_parser = RequestLogAnalyzer::Source::LogParser.new(RequestLogAnalyzer::FileFormat.load(:delayed_job21))
+    end
+    
+    it "should parse a batch of completed jobs without warnings" do
+      fragment = <<-EOLOG
+        2010-05-17T17:36:44+0000: *** Starting job worker delayed_job host:hostname.co.uk pid:11888
+        2010-05-17T17:37:34+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob
+        2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob completed after 1.0676
+        2010-05-17T17:37:35+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob
+        2010-05-17T17:37:37+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob completed after 1.4407
+        2010-05-17T17:37:37+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] acquired lock on S3FileJob
+        2010-05-17T17:37:44+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] S3FileJob completed after 6.9374
+        2010-05-17T17:37:44+0000: [Worker(delayed_job host:hostname.co.uk pid:11888)] 3 jobs processed at 0.3163 j/s, 0 failed ...
+        2010-05-19T11:47:26+0000: Exiting...
+      EOLOG
+
+      request_counter.should_receive(:hit!).exactly(3).times
+      @log_parser.should_not_receive(:warn)
+
+      @log_parser.parse_io(StringIO.new(fragment)) do |request|
+        request_counter.hit! if request.kind_of?(RequestLogAnalyzer::FileFormat::DelayedJob21::Request)
+      end
+    end
+  end
+end

data/spec/unit/tracker/duration_tracker_spec.rb

@@ -27,7 +27,9 @@ describe RequestLogAnalyzer::Tracker::Duration do
     it "should generate a YAML output" do
       @tracker.update(request(:category => 'a', :duration => 0.2))
       @tracker.update(request(:category => 'b', :duration => 0.2))
-      @tracker.to_yaml_object.should == {"a"=>{:hits=>1, :min=>0.2, :mean=>0.2, :max=>0.2, :sum_of_squares=>0.0, :sum=>0.2}, "b"=>{:hits=>1, :min=>0.2, :mean=>0.2, :max=>0.2, :sum_of_squares=>0.0, :sum=>0.2}}
+      @tracker.to_yaml_object.keys.should =~ ['a', 'b']
+      @tracker.to_yaml_object['a'].should include(:min => 0.2, :hits => 1, :max => 0.2, :mean => 0.2, :sum => 0.2, :sum_of_squares => 0.0)
+      @tracker.to_yaml_object['b'].should include(:min => 0.2, :hits => 1, :max => 0.2, :mean => 0.2, :sum => 0.2, :sum_of_squares => 0.0)
     end
   end
   

data/spec/unit/tracker/numeric_value_tracker_spec.rb

@@ -22,7 +22,7 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
       @tracker.categories['b'][:sum].should == 4
     end
   end
-  
+
 
   context 'dynamic category' do
     before(:each) do
@@ -40,11 +40,12 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
       @tracker.categories['slow'][:sum].should == 4
     end
   end
-  
-  describe '#update' do
 
+  describe '#update' do
     before(:each) do
-      @tracker = RequestLogAnalyzer::Tracker::NumericValue.new(:value => :duration, :category => :category)
+      @tracker = RequestLogAnalyzer::Tracker::NumericValue.new(:value => :duration, :category => :category,
+                                                    :min_bucket_value => 0.0001, :max_bucket_value => 1000)
+
       @tracker.prepare
 
       @tracker.update(request(:category => 'a', :duration => 0.4))
@@ -80,7 +81,25 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
     it "should calculate the duration standard deviation correctly" do
       @tracker.stddev('a').should be_close(0.1,  0.000001)
     end
-  end  
+
+    it "should calculate the bucket spread correctly" do
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      @tracker.update(request(:category => 'a', :duration => 0.3))
+      # 0.2, 0.3 and 0.4 are already there, so, 10 values in total
+      
+      @tracker.median('a').should be_close(0.3, 0.01)
+      
+      @tracker.percentile_interval('a', 80).begin.should be_close(0.3, 0.01)
+      @tracker.percentile_interval('a', 80).end.should be_close(0.3, 0.01)
+      @tracker.percentile_interval('a', 90).begin.should be_close(0.2, 0.01)
+      @tracker.percentile_interval('a', 90).end.should be_close(0.4, 0.01)
+    end
+  end
 
   describe '#report' do
     before(:each) do
@@ -113,9 +132,9 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
     it "should generate a YAML output" do
       @tracker.update(request(:category => 'a', :blah => 2))
       @tracker.update(request(:category => 'b', :blah => 3))
-      @tracker.to_yaml_object.should == {
-            "a" => { :min => 2, :hits => 1, :max => 2, :mean => 2.0, :sum => 2, :sum_of_squares => 0.0 },
-            "b" => { :min => 3, :hits => 1, :max => 3, :mean => 3.0, :sum => 3, :sum_of_squares => 0.0 }}
+      @tracker.to_yaml_object.keys.should =~ ['a', 'b']
+      @tracker.to_yaml_object['a'].should include(:min => 2, :hits => 1, :max => 2, :mean => 2.0, :sum => 2, :sum_of_squares => 0.0)
+      @tracker.to_yaml_object['b'].should include(:min => 3, :hits => 1, :max => 3, :mean => 3.0, :sum => 3, :sum_of_squares => 0.0)      
     end
   end
 
@@ -161,6 +180,4 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
       @tracker.display_value(9000_000_001_001_000).should eql('9000T')
     end
   end
-  
-  
 end

data/tasks/github-gem.rake

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'rake/tasklib'
 require 'date'
-require 'git'
+require 'set'
 
 module GithubGem
 
@@ -24,7 +24,7 @@ module GithubGem
 
   class RakeTasks
 
-    attr_reader   :gemspec, :modified_files, :git
+    attr_reader   :gemspec, :modified_files
     attr_accessor :gemspec_file, :task_namespace, :main_include, :root_dir, :spec_pattern, :test_pattern, :remote, :remote_branch, :local_branch
 
     # Initializes the settings, yields itself for configuration
@@ -33,7 +33,7 @@ module GithubGem
       @gemspec_file   = GithubGem.detect_gemspec_file
       @task_namespace = task_namespace
       @main_include   = GithubGem.detect_main_include
-      @modified_files = []
+      @modified_files = Set.new
       @root_dir       = Dir.pwd
       @test_pattern   = 'test/**/*_test.rb'
       @spec_pattern   = 'spec/**/*_spec.rb'
@@ -43,13 +43,16 @@ module GithubGem
 
       yield(self) if block_given?
 
-      @git = Git.open(@root_dir)
       load_gemspec!
       define_tasks!
     end
 
     protected
 
+    def git
+      @git ||= ENV['GIT'] || 'git'
+    end
+
     # Define Unit test tasks
     def define_test_tasks!
       require 'rake/testtask'
@@ -165,7 +168,7 @@ module GithubGem
     # in the repository and the spec/test file pattern.
     def manifest_task
       # Load all the gem's files using "git ls-files"
-      repository_files = git.ls_files.keys
+      repository_files = `#{git} ls-files`.split("\n")
       test_files       = Dir[test_pattern] + Dir[spec_pattern]
 
       update_gemspec(:files, repository_files)
@@ -180,7 +183,7 @@ module GithubGem
     end
 
     def newest_version
-      git.tags.map { |tag| tag.name.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
+      `#{git} tag`.split("\n").map { |tag| tag.split('-').last }.compact.map { |v| Gem::Version.new(v) }.max || Gem::Version.new('0.0.0')
     end
 
     def next_version(increment = nil)
@@ -223,58 +226,45 @@ module GithubGem
 
     # Checks whether the current branch is not diverged from the remote branch
     def check_not_diverged_task
-      raise "The current branch is diverged from the remote branch!" if git.log.between('HEAD', git.remote(remote).branch(remote_branch).gcommit).any?
+      raise "The current branch is diverged from the remote branch!" if `#{git} rev-list HEAD..#{remote}/#{remote_branch}`.split("\n").any?
     end
 
     # Checks whether the repository status ic clean
     def check_clean_status_task
-      raise "The current working copy contains modifications" if git.status.changed.any?
+      raise "The current working copy contains modifications" if `#{git} ls-files -m`.split("\n").any?
     end
 
     # Checks whether the current branch is correct
     def check_current_branch_task
-      raise "Currently not on #{local_branch} branch!" unless git.branch.name == local_branch.to_s
+      raise "Currently not on #{local_branch} branch!" unless `#{git} branch`.split("\n").detect { |b| /^\* / =~ b } == "* #{local_branch}"
     end
 
     # Fetches the latest updates from Github
     def fetch_origin_task
-      git.fetch('origin')
+      sh git, 'fetch', remote
     end
 
     # Commits every file that has been changed by the release task.
     def commit_modified_files_task
-      if modified_files.any?
-        modified_files.each { |file| git.add(file) }
-        git.commit("Released #{gemspec.name} gem version #{gemspec.version}")
+      really_modified = `#{git} ls-files -m #{modified_files.entries.join(' ')}`.split("\n")
+      if really_modified.any?
+        really_modified.each { |file| sh git, 'add', file }
+        sh git, 'commit', '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
       end
     end
 
     # Adds a tag for the released version
     def tag_version_task
-      git.add_tag("#{gemspec.name}-#{gemspec.version}")
+      sh git, 'tag', '-a', "#{gemspec.name}-#{gemspec.version}", '-m', "Released #{gemspec.name} gem version #{gemspec.version}."
     end
 
     # Pushes the changes and tag to github
     def github_release_task
-      git.push(remote, remote_branch, true)
+      sh git, 'push', '--tags', remote, remote_branch
     end
 
-    # # Checks whether Rubyforge is configured properly
-    # def check_rubyforge_task
-    #   # Login no longer necessary when using rubyforge 2.0.0 gem
-    #   # raise "Could not login on rubyforge!" unless `rubyforge login 2>&1`.strip.empty?
-    #   output = `rubyforge names`.split("\n")
-    #   raise "Rubyforge group not found!"   unless output.any? { |line| %r[^groups\s*\:.*\b#{Regexp.quote(gemspec.rubyforge_project)}\b.*] =~ line }
-    #   raise "Rubyforge package not found!" unless output.any? { |line| %r[^packages\s*\:.*\b#{Regexp.quote(gemspec.name)}\b.*] =~ line }
-    # end
-
-    # # Task to release the .gem file toRubyforge.
-    # def rubyforge_release_task
-    #   sh 'rubyforge', 'add_release', gemspec.rubyforge_project, gemspec.name, gemspec.version.to_s, "pkg/#{gemspec.name}-#{gemspec.version}.gem"
-    # end
-    
     def gemcutter_release_task
-      sh "gem push pkg/#{gemspec.name}-#{gemspec.version}.gem"
+      sh "gem", 'push', "pkg/#{gemspec.name}-#{gemspec.version}.gem"
     end
 
     # Gem release task.
@@ -357,15 +347,13 @@ module GithubGem
         open(__FILE__, "w") { |file| file.write(response.body) }
       end
 
-      relative_file = File.expand_path(__FILE__).sub(%r[^#{git.dir.path}/], '')
-      if git.status[relative_file] && git.status[relative_file].type == 'M'
-        git.add(relative_file)
-        git.commit("Updated to latest gem release management tasks.")
-        puts "Updated to latest version of gem release management tasks."
+      relative_file = File.expand_path(__FILE__).sub(%r[^#{@root_dir}/], '')
+      if `#{git} ls-files -m #{relative_file}`.split("\n").any?
+        sh git, 'add', relative_file
+        sh git, 'commit', '-m', "Updated to latest gem release management tasks."
       else
         puts "Release managament tasks already are at the latest version."
       end
     end
-
   end
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
+  hash: 51
   prerelease: false
   segments: 
   - 1
-  - 8
-  - 1
-  version: 1.8.1
+  - 9
+  - 0
+  version: 1.9.0
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,16 +16,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-31 00:00:00 -07:00
+date: 2010-09-26 00:00:00 +02:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -34,9 +37,11 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -46,9 +51,11 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -58,9 +65,11 @@ dependencies:
   name: sqlite3-ruby
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -70,9 +79,11 @@ dependencies:
   name: git
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -82,9 +93,11 @@ dependencies:
   name: gemcutter
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -101,142 +114,144 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- spec/unit/file_format/delayed_job_format_spec.rb
-- spec/fixtures/rails_unordered.log
-- spec/unit/filter/anonymize_filter_spec.rb
-- lib/request_log_analyzer/output/fancy_html.rb
+- .gitignore
+- DESIGN.rdoc
+- LICENSE
 - README.rdoc
+- Rakefile
+- bin/request-log-analyzer
+- lib/cli/command_line_arguments.rb
+- lib/cli/database_console.rb
+- lib/cli/database_console_init.rb
 - lib/cli/progressbar.rb
-- spec/fixtures/rails.db
-- lib/request_log_analyzer/file_format/rails_development.rb
-- spec/fixtures/rails_22.log
-- spec/unit/file_format/delayed_job2_format_spec.rb
-- spec/fixtures/test_order.log
-- spec/fixtures/header_and_footer.log
+- lib/cli/tools.rb
 - lib/mixins/gets_memory_protection.rb
-- spec/fixtures/decompression.log
-- spec/fixtures/rails_1x.log
-- lib/request_log_analyzer/file_format/apache.rb
-- lib/request_log_analyzer/output.rb
-- lib/request_log_analyzer/tracker/numeric_value.rb
-- spec/unit/file_format/line_definition_spec.rb
-- spec/unit/request_spec.rb
-- spec/unit/filter/filter_spec.rb
-- spec/unit/aggregator/summarizer_spec.rb
-- lib/request_log_analyzer/file_format/rails.rb
-- spec/database.yml
-- spec/unit/tracker/numeric_value_tracker_spec.rb
-- spec/spec_helper.rb
+- lib/request_log_analyzer.rb
+- lib/request_log_analyzer/aggregator.rb
+- lib/request_log_analyzer/aggregator/database_inserter.rb
+- lib/request_log_analyzer/aggregator/echo.rb
+- lib/request_log_analyzer/aggregator/summarizer.rb
+- lib/request_log_analyzer/controller.rb
+- lib/request_log_analyzer/database.rb
 - lib/request_log_analyzer/database/base.rb
-- spec/unit/aggregator/database_inserter_spec.rb
-- spec/fixtures/decompression.log.bz2
-- spec/unit/database/connection_spec.rb
-- spec/fixtures/oink_22.log
-- spec/fixtures/sinatra.log
+- lib/request_log_analyzer/database/connection.rb
+- lib/request_log_analyzer/database/request.rb
+- lib/request_log_analyzer/database/source.rb
 - lib/request_log_analyzer/database/warning.rb
-- spec/fixtures/merb_prefixed.log
-- spec/unit/file_format/postgresql_format_spec.rb
-- lib/request_log_analyzer/filter/timespan.rb
-- spec/fixtures/rails_22_cached.log
-- lib/request_log_analyzer/tracker/traffic.rb
-- spec/unit/file_format/format_autodetection_spec.rb
-- lib/request_log_analyzer/filter/field.rb
+- lib/request_log_analyzer/file_format.rb
+- lib/request_log_analyzer/file_format/amazon_s3.rb
+- lib/request_log_analyzer/file_format/apache.rb
 - lib/request_log_analyzer/file_format/delayed_job.rb
+- lib/request_log_analyzer/file_format/delayed_job2.rb
+- lib/request_log_analyzer/file_format/delayed_job21.rb
 - lib/request_log_analyzer/file_format/merb.rb
+- lib/request_log_analyzer/file_format/mysql.rb
 - lib/request_log_analyzer/file_format/oink.rb
+- lib/request_log_analyzer/file_format/postgresql.rb
+- lib/request_log_analyzer/file_format/rack.rb
+- lib/request_log_analyzer/file_format/rails.rb
+- lib/request_log_analyzer/file_format/rails3.rb
+- lib/request_log_analyzer/file_format/rails_development.rb
+- lib/request_log_analyzer/filter.rb
 - lib/request_log_analyzer/filter/anonymize.rb
-- lib/request_log_analyzer/file_format/amazon_s3.rb
-- LICENSE
-- lib/request_log_analyzer/file_format.rb
-- lib/cli/database_console.rb
-- spec/integration/mailer_spec.rb
-- spec/fixtures/merb.log
+- lib/request_log_analyzer/filter/field.rb
+- lib/request_log_analyzer/filter/timespan.rb
 - lib/request_log_analyzer/line_definition.rb
-- spec/unit/tracker/frequency_tracker_spec.rb
-- spec/unit/mailer_spec.rb
-- spec/fixtures/postgresql.log
-- spec/lib/mocks.rb
-- lib/request_log_analyzer/tracker/hourly_spread.rb
-- spec/unit/file_format/rails3_format_spec.rb
-- spec/fixtures/syslog_1x.log
-- lib/request_log_analyzer/source.rb
-- lib/request_log_analyzer/file_format/rails3.rb
-- spec/unit/controller/log_processor_spec.rb
-- spec/unit/tracker/hourly_spread_spec.rb
-- spec/unit/filter/field_filter_spec.rb
-- DESIGN.rdoc
 - lib/request_log_analyzer/log_processor.rb
-- spec/fixtures/multiple_files_1.log
-- spec/unit/source/log_parser_spec.rb
-- spec/fixtures/decompression.tar.gz
-- spec/unit/database/base_class_spec.rb
-- lib/request_log_analyzer/aggregator/database_inserter.rb
-- lib/request_log_analyzer/database/connection.rb
-- lib/request_log_analyzer/aggregator.rb
-- lib/request_log_analyzer/database.rb
-- spec/unit/file_format/rails_format_spec.rb
-- lib/request_log_analyzer/source/database_loader.rb
+- lib/request_log_analyzer/mailer.rb
+- lib/request_log_analyzer/output.rb
+- lib/request_log_analyzer/output/fancy_html.rb
 - lib/request_log_analyzer/output/fixed_width.rb
-- spec/integration/command_line_usage_spec.rb
-- tasks/request_log_analyzer.rake
-- lib/request_log_analyzer/tracker/duration.rb
-- spec/fixtures/test_language_combined.log
-- bin/request-log-analyzer
-- lib/request_log_analyzer/tracker.rb
-- tasks/github-gem.rake
-- lib/cli/command_line_arguments.rb
-- lib/request_log_analyzer.rb
-- .gitignore
 - lib/request_log_analyzer/output/html.rb
-- lib/request_log_analyzer/database/request.rb
-- lib/cli/database_console_init.rb
-- lib/request_log_analyzer/database/source.rb
-- spec/unit/file_format/amazon_s3_format_spec.rb
-- lib/request_log_analyzer/filter.rb
-- spec/fixtures/apache_combined.log
-- spec/unit/tracker/duration_tracker_spec.rb
-- spec/fixtures/test_file_format.log
-- lib/request_log_analyzer/aggregator/summarizer.rb
-- spec/fixtures/oink_22_failure.log
-- spec/unit/filter/timespan_filter_spec.rb
-- spec/unit/file_format/common_regular_expressions_spec.rb
-- spec/unit/file_format/merb_format_spec.rb
-- spec/unit/file_format/file_format_api_spec.rb
-- lib/request_log_analyzer/file_format/delayed_job2.rb
-- spec/unit/file_format/rack_format_spec.rb
-- spec/unit/file_format/mysql_format_spec.rb
-- lib/request_log_analyzer/file_format/mysql.rb
-- spec/fixtures/decompression.log.gz
+- lib/request_log_analyzer/request.rb
+- lib/request_log_analyzer/source.rb
+- lib/request_log_analyzer/source/database_loader.rb
+- lib/request_log_analyzer/source/log_parser.rb
+- lib/request_log_analyzer/tracker.rb
+- lib/request_log_analyzer/tracker/duration.rb
 - lib/request_log_analyzer/tracker/frequency.rb
+- lib/request_log_analyzer/tracker/hourly_spread.rb
+- lib/request_log_analyzer/tracker/numeric_value.rb
+- lib/request_log_analyzer/tracker/timespan.rb
+- lib/request_log_analyzer/tracker/traffic.rb
 - request-log-analyzer.gemspec
+- spec/database.yml
+- spec/fixtures/apache_combined.log
 - spec/fixtures/apache_common.log
-- Rakefile
-- spec/unit/tracker/traffic_tracker_spec.rb
-- lib/request_log_analyzer/file_format/postgresql.rb
-- lib/request_log_analyzer/tracker/timespan.rb
-- spec/lib/macros.rb
-- spec/integration/scout_spec.rb
-- spec/unit/controller/controller_spec.rb
-- lib/request_log_analyzer/mailer.rb
-- lib/cli/tools.rb
-- spec/unit/tracker/timespan_tracker_spec.rb
-- spec/lib/testing_format.rb
-- spec/lib/matchers.rb
-- lib/request_log_analyzer/controller.rb
-- spec/unit/tracker/tracker_api_spec.rb
-- lib/request_log_analyzer/request.rb
-- spec/unit/file_format/oink_format_spec.rb
-- spec/fixtures/multiple_files_2.log
-- spec/unit/database/database_spec.rb
+- spec/fixtures/decompression.log
+- spec/fixtures/decompression.log.bz2
+- spec/fixtures/decompression.log.gz
 - spec/fixtures/decompression.log.zip
+- spec/fixtures/decompression.tar.gz
 - spec/fixtures/decompression.tgz
-- lib/request_log_analyzer/file_format/rack.rb
-- spec/integration/munin_plugins_rails_spec.rb
+- spec/fixtures/header_and_footer.log
+- spec/fixtures/merb.log
+- spec/fixtures/merb_prefixed.log
+- spec/fixtures/multiple_files_1.log
+- spec/fixtures/multiple_files_2.log
 - spec/fixtures/mysql_slow_query.log
+- spec/fixtures/oink_22.log
+- spec/fixtures/oink_22_failure.log
+- spec/fixtures/postgresql.log
+- spec/fixtures/rails.db
+- spec/fixtures/rails_1x.log
+- spec/fixtures/rails_22.log
+- spec/fixtures/rails_22_cached.log
+- spec/fixtures/rails_unordered.log
+- spec/fixtures/sinatra.log
+- spec/fixtures/syslog_1x.log
+- spec/fixtures/test_file_format.log
+- spec/fixtures/test_language_combined.log
+- spec/fixtures/test_order.log
+- spec/integration/command_line_usage_spec.rb
+- spec/integration/mailer_spec.rb
+- spec/integration/munin_plugins_rails_spec.rb
+- spec/integration/scout_spec.rb
 - spec/lib/helpers.rb
-- lib/request_log_analyzer/source/log_parser.rb
-- lib/request_log_analyzer/aggregator/echo.rb
+- spec/lib/macros.rb
+- spec/lib/matchers.rb
+- spec/lib/mocks.rb
+- spec/lib/testing_format.rb
+- spec/spec_helper.rb
+- spec/unit/aggregator/database_inserter_spec.rb
+- spec/unit/aggregator/summarizer_spec.rb
+- spec/unit/controller/controller_spec.rb
+- spec/unit/controller/log_processor_spec.rb
+- spec/unit/database/base_class_spec.rb
+- spec/unit/database/connection_spec.rb
+- spec/unit/database/database_spec.rb
+- spec/unit/file_format/amazon_s3_format_spec.rb
 - spec/unit/file_format/apache_format_spec.rb
+- spec/unit/file_format/common_regular_expressions_spec.rb
+- spec/unit/file_format/delayed_job21_format_spec.rb
+- spec/unit/file_format/delayed_job2_format_spec.rb
+- spec/unit/file_format/delayed_job_format_spec.rb
+- spec/unit/file_format/file_format_api_spec.rb
+- spec/unit/file_format/format_autodetection_spec.rb
+- spec/unit/file_format/line_definition_spec.rb
+- spec/unit/file_format/merb_format_spec.rb
+- spec/unit/file_format/mysql_format_spec.rb
+- spec/unit/file_format/oink_format_spec.rb
+- spec/unit/file_format/postgresql_format_spec.rb
+- spec/unit/file_format/rack_format_spec.rb
+- spec/unit/file_format/rails3_format_spec.rb
+- spec/unit/file_format/rails_format_spec.rb
+- spec/unit/filter/anonymize_filter_spec.rb
+- spec/unit/filter/field_filter_spec.rb
+- spec/unit/filter/filter_spec.rb
+- spec/unit/filter/timespan_filter_spec.rb
+- spec/unit/mailer_spec.rb
+- spec/unit/request_spec.rb
+- spec/unit/source/log_parser_spec.rb
+- spec/unit/tracker/duration_tracker_spec.rb
+- spec/unit/tracker/frequency_tracker_spec.rb
+- spec/unit/tracker/hourly_spread_spec.rb
+- spec/unit/tracker/numeric_value_tracker_spec.rb
+- spec/unit/tracker/timespan_tracker_spec.rb
+- spec/unit/tracker/tracker_api_spec.rb
+- spec/unit/tracker/traffic_tracker_spec.rb
+- tasks/github-gem.rake
+- tasks/request_log_analyzer.rake
 has_rdoc: true
 homepage: http://railsdoctors.com
 licenses: []
@@ -252,64 +267,69 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: 
 - To use the database inserter, ActiveRecord and an appropriate database adapter are required.
 rubyforge_project: r-l-a
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL and other web application servers
 test_files: 
-- spec/unit/file_format/delayed_job_format_spec.rb
-- spec/unit/filter/anonymize_filter_spec.rb
-- spec/unit/file_format/delayed_job2_format_spec.rb
-- spec/unit/file_format/line_definition_spec.rb
-- spec/unit/request_spec.rb
-- spec/unit/filter/filter_spec.rb
-- spec/unit/aggregator/summarizer_spec.rb
-- spec/unit/tracker/numeric_value_tracker_spec.rb
-- spec/unit/aggregator/database_inserter_spec.rb
-- spec/unit/database/connection_spec.rb
-- spec/unit/file_format/postgresql_format_spec.rb
-- spec/unit/file_format/format_autodetection_spec.rb
+- spec/integration/command_line_usage_spec.rb
 - spec/integration/mailer_spec.rb
-- spec/unit/tracker/frequency_tracker_spec.rb
-- spec/unit/mailer_spec.rb
-- spec/unit/file_format/rails3_format_spec.rb
+- spec/integration/munin_plugins_rails_spec.rb
+- spec/integration/scout_spec.rb
+- spec/unit/aggregator/database_inserter_spec.rb
+- spec/unit/aggregator/summarizer_spec.rb
+- spec/unit/controller/controller_spec.rb
 - spec/unit/controller/log_processor_spec.rb
-- spec/unit/tracker/hourly_spread_spec.rb
-- spec/unit/filter/field_filter_spec.rb
-- spec/unit/source/log_parser_spec.rb
 - spec/unit/database/base_class_spec.rb
-- spec/unit/file_format/rails_format_spec.rb
-- spec/integration/command_line_usage_spec.rb
+- spec/unit/database/connection_spec.rb
+- spec/unit/database/database_spec.rb
 - spec/unit/file_format/amazon_s3_format_spec.rb
-- spec/unit/tracker/duration_tracker_spec.rb
-- spec/unit/filter/timespan_filter_spec.rb
+- spec/unit/file_format/apache_format_spec.rb
 - spec/unit/file_format/common_regular_expressions_spec.rb
-- spec/unit/file_format/merb_format_spec.rb
+- spec/unit/file_format/delayed_job21_format_spec.rb
+- spec/unit/file_format/delayed_job2_format_spec.rb
+- spec/unit/file_format/delayed_job_format_spec.rb
 - spec/unit/file_format/file_format_api_spec.rb
-- spec/unit/file_format/rack_format_spec.rb
+- spec/unit/file_format/format_autodetection_spec.rb
+- spec/unit/file_format/line_definition_spec.rb
+- spec/unit/file_format/merb_format_spec.rb
 - spec/unit/file_format/mysql_format_spec.rb
-- spec/unit/tracker/traffic_tracker_spec.rb
-- spec/integration/scout_spec.rb
-- spec/unit/controller/controller_spec.rb
+- spec/unit/file_format/oink_format_spec.rb
+- spec/unit/file_format/postgresql_format_spec.rb
+- spec/unit/file_format/rack_format_spec.rb
+- spec/unit/file_format/rails3_format_spec.rb
+- spec/unit/file_format/rails_format_spec.rb
+- spec/unit/filter/anonymize_filter_spec.rb
+- spec/unit/filter/field_filter_spec.rb
+- spec/unit/filter/filter_spec.rb
+- spec/unit/filter/timespan_filter_spec.rb
+- spec/unit/mailer_spec.rb
+- spec/unit/request_spec.rb
+- spec/unit/source/log_parser_spec.rb
+- spec/unit/tracker/duration_tracker_spec.rb
+- spec/unit/tracker/frequency_tracker_spec.rb
+- spec/unit/tracker/hourly_spread_spec.rb
+- spec/unit/tracker/numeric_value_tracker_spec.rb
 - spec/unit/tracker/timespan_tracker_spec.rb
 - spec/unit/tracker/tracker_api_spec.rb
-- spec/unit/file_format/oink_format_spec.rb
-- spec/unit/database/database_spec.rb
-- spec/integration/munin_plugins_rails_spec.rb
-- spec/unit/file_format/apache_format_spec.rb
+- spec/unit/tracker/traffic_tracker_spec.rb