request-log-analyzer 1.9.9 → 1.10.0

data/.gitignore

@@ -8,4 +8,6 @@ requests.db
 /tmp
 /classes
 /files
-/coverage
+/coverage
+Gemfile.lock
+/.bundle/

data/Gemfile

@@ -0,0 +1,2 @@
+source :rubygems
+gemspec

data/lib/request_log_analyzer/controller.rb

@@ -20,11 +20,11 @@ module RequestLogAnalyzer
     # Builds a RequestLogAnalyzer::Controller given parsed command line arguments
     # <tt>arguments<tt> A CommandLine::Arguments hash containing parsed commandline parameters.
     def self.build_from_arguments(arguments)
-      
+
       require 'mixins/gets_memory_protection' if arguments[:gets_memory_protection]
-      
+
       options = {}
-      
+
       # Copy fields
       options[:database]       = arguments[:database]
       options[:reset_database] = arguments[:reset_database]
@@ -33,7 +33,7 @@ module RequestLogAnalyzer
       options[:mail]           = arguments[:mail]
       options[:no_progress]    = arguments[:no_progress]
       options[:format]         = arguments[:format]
-      options[:output]         = arguments[:output].downcase
+      options[:output]         = arguments[:output]
       options[:file]           = arguments[:file]
       options[:after]          = arguments[:after]
       options[:before]         = arguments[:before]
@@ -44,25 +44,25 @@ module RequestLogAnalyzer
       options[:report_width]   = arguments[:report_width]
       options[:report_sort]    = arguments[:report_sort]
       options[:report_amount]  = arguments[:report_amount]
-      options[:mailhost]       = arguments[:mailhost] 
+      options[:mailhost]       = arguments[:mailhost]
       options[:mailsubject]    = arguments[:mailsubject]
-      options[:silent]         = arguments[:silent] 
-      options[:parse_strategy] = arguments[:parse_strategy] 
-      
+      options[:silent]         = arguments[:silent]
+      options[:parse_strategy] = arguments[:parse_strategy]
+
       # Apache format workaround
       if arguments[:rails_format]
         options[:format] = {:rails => arguments[:rails_format]}
       elsif arguments[:apache_format]
         options[:format] = {:apache => arguments[:apache_format]}
       end
-      
+
       # Handle output format casing
       if options[:output].class == String
         options[:output] = 'FancyHTML'  if options[:output] =~ /^fancy_?html$/i
         options[:output] = 'HTML'       if options[:output] =~ /^html$/i
         options[:output] = 'FixedWidth' if options[:output] =~ /^fixed_?width$/i
       end
-      
+
       # Register sources
       if arguments.parameters.length == 1
         file = arguments.parameters[0]
@@ -77,7 +77,7 @@ module RequestLogAnalyzer
       else
         options.store(:source_files, arguments.parameters)
       end
-      
+
       # Guess file format
       if !options[:format] && options[:source_files]
         options[:format] = :rails # Default
@@ -91,7 +91,7 @@ module RequestLogAnalyzer
           end
         end
       end
-      
+
       build(options)
     end
 
@@ -124,7 +124,7 @@ module RequestLogAnalyzer
     # RequestLogAnalyzer::Controller.build(
     #   :output       => :HTML,
     #   :mail         => 'root@localhost',
-    #   :after        => Time.now - 24*60*60, 
+    #   :after        => Time.now - 24*60*60,
     #   :source_files => '/var/log/passenger.log'
     # ).run!
     #
@@ -141,15 +141,15 @@ module RequestLogAnalyzer
       options[:report_sort]   ||= 'sum,mean'
       options[:boring]        ||= false
       options[:silent]        ||= false
-      
+
       options[:no_progress] = true if options[:silent]
-      
+
       # Deprecation warnings
       if options[:dump]
         warn "[DEPRECATION] `:dump` is deprecated.  Please use `:yaml` instead."
         options[:yaml]          = options[:dump]
       end
-      
+
       # Set the output class
       output_args   = {}
       output_object = nil
@@ -158,10 +158,10 @@ module RequestLogAnalyzer
       else
         output_class = RequestLogAnalyzer::Output.const_get(options[:output])
       end
-      
+
       output_sort   = options[:report_sort].split(',').map { |s| s.to_sym }
       output_amount = options[:report_amount] == 'all' ? :all : options[:report_amount].to_i
-      
+
       if options[:file]
         output_object = %w[File StringIO].include?(options[:file].class.name) ? options[:file] : File.new(options[:file], "w+")
         output_args   = {:width => 80, :color => false, :characters => :ascii, :sort => output_sort, :amount => output_amount }
@@ -173,26 +173,26 @@ module RequestLogAnalyzer
         output_args   = {:width => options[:report_width].to_i, :color => !options[:boring],
                         :characters => (options[:boring] ? :ascii : :utf), :sort => output_sort, :amount => output_amount }
       end
-      
+
       output_instance = output_class.new(output_object, output_args)
-      
+
       # Create the controller with the correct file format
       if options[:format].kind_of?(Hash)
         file_format = RequestLogAnalyzer::FileFormat.load(options[:format].keys[0], options[:format].values[0])
       else
         file_format = RequestLogAnalyzer::FileFormat.load(options[:format])
       end
-      
+
       # Kickstart the controller
-      controller = 
-        Controller.new(RequestLogAnalyzer::Source::LogParser.new(file_format,  
-                                                                 :source_files => options[:source_files], 
+      controller =
+        Controller.new(RequestLogAnalyzer::Source::LogParser.new(file_format,
+                                                                 :source_files => options[:source_files],
                                                                  :parse_strategy => options[:parse_strategy]),
                        { :output         => output_instance,
                          :database       => options[:database],                # FUGLY!
-                         :yaml           => options[:yaml], 
+                         :yaml           => options[:yaml],
                          :reset_database => options[:reset_database],
-                         :no_progress    => options[:no_progress], 
+                         :no_progress    => options[:no_progress],
                          :silent         => options[:silent]
                        })
 
@@ -230,7 +230,7 @@ module RequestLogAnalyzer
 
       file_format.setup_environment(controller)
       return controller
-    end  
+    end
 
     # Builds a new Controller for the given log file format.
     # <tt>format</tt> Logfile format. Defaults to :rails
@@ -248,7 +248,7 @@ module RequestLogAnalyzer
       @filters     = []
       @output      = options[:output]
       @interrupted = false
-      
+
       # Register the request format for this session after checking its validity
       raise "Invalid file format!" unless @source.file_format.valid?
 

data/lib/request_log_analyzer/file_format/apache.rb

@@ -30,20 +30,23 @@ module RequestLogAnalyzer::FileFormat
 
     # A hash that defines how the log format directives should be parsed.
     LOG_DIRECTIVES = {
-      '%' => { :regexp => '%', :captures => [] },
-      'h' => { :regexp => '([A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+)',  :captures => [{:name => :remote_host, :type => :string}] },
-      'a' => { :regexp => "(#{ip_address})", :captures => [{:name => :remote_ip, :type => :string}] },
-      'b' => { :regexp => '(\d+|-)', :captures => [{:name => :bytes_sent, :type => :traffic}] },
-      'c' => { :regexp => '(\+|\-|\X)', :captures => [{:name => :connection_status, :type => :integer}] },
-      'D' => { :regexp => '(\d+|-)', :captures => [{:name => :duration, :type => :duration, :unit => :musec}] },
-      'l' => { :regexp => '([\w-]+)', :captures => [{:name => :remote_logname, :type => :nillable_string}] },
-      'T' => { :regexp => '((?:\d+(?:\.\d+))|-)', :captures => [{:name => :duration, :type => :duration, :unit => :sec}] },
-      't' => { :regexp => "\\[(#{APACHE_TIMESTAMP})?\\]", :captures => [{:name => :timestamp, :type => :timestamp}] },
-      's' => { :regexp => '(\d{3})', :captures => [{:name => :http_status, :type => :integer}] },
-      'u' => { :regexp => '(\w+|-)', :captures => [{:name => :user, :type => :nillable_string}] },
-      'U' => { :regexp => '(\/\S*)', :captures => [{:name => :path, :type => :string}] },
-      'r' => { :regexp => '([A-Z]+) (\S+) HTTP\/(\d+(?:\.\d+)*)', :captures => [{:name => :http_method, :type => :string},
-                       {:name => :path, :type => :path}, {:name => :http_version, :type => :string}]},
+      '%' => { nil => { :regexp => '%', :captures => [] } },
+      'h' => { nil => { :regexp => '([A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)+)',  :captures => [{:name => :remote_host, :type => :string}] } },
+      'a' => { nil => { :regexp => "(#{ip_address})", :captures => [{:name => :remote_ip, :type => :string}] } },
+      'b' => { nil => { :regexp => '(\d+|-)', :captures => [{:name => :bytes_sent, :type => :traffic}] } },
+      'c' => { nil => { :regexp => '(\+|\-|\X)', :captures => [{:name => :connection_status, :type => :integer}] } },
+      'D' => { nil     => { :regexp => '(\d+|-)', :captures => [ {:name => :duration, :type => :duration, :unit => :musec }] },
+               'micro' => { :regexp => '(\d+|-)', :captures => [ {:name => :duration, :type => :duration, :unit => :musec }] },
+               'milli' => { :regexp => '(\d+|-)', :captures => [ {:name => :duration, :type => :duration, :unit => :msec }] }
+             },
+      'l' => { nil => { :regexp => '([\w-]+)', :captures => [{:name => :remote_logname, :type => :nillable_string}] } },
+      'T' => { nil => { :regexp => '((?:\d+(?:\.\d+))|-)', :captures => [{:name => :duration, :type => :duration, :unit => :sec}] } },
+      't' => { nil => { :regexp => "\\[(#{APACHE_TIMESTAMP})?\\]", :captures => [{:name => :timestamp, :type => :timestamp}] } },
+      's' => { nil => { :regexp => '(\d{3})', :captures => [{:name => :http_status, :type => :integer}] } },
+      'u' => { nil => { :regexp => '(\w+|-)', :captures => [{:name => :user, :type => :nillable_string}] } },
+      'U' => { nil => { :regexp => '(\/\S*)', :captures => [{:name => :path, :type => :string}] } },
+      'r' => { nil => { :regexp => '([A-Z]+) (\S+) HTTP\/(\d+(?:\.\d+)*)', :captures => [{:name => :http_method, :type => :string},
+                       {:name => :path, :type => :path}, {:name => :http_version, :type => :string}]} },
       'i' => { 'Referer'    => { :regexp => '(\S+)', :captures => [{:name => :referer, :type => :nillable_string}] },
                'User-agent' => { :regexp => '(.*)',  :captures => [{:name => :user_agent, :type => :user_agent}] }
              }
@@ -72,14 +75,13 @@ module RequestLogAnalyzer::FileFormat
 
         if variable
           # Check if we recognize the log directive
-          directive = LOG_DIRECTIVES[variable]
-          directive = directive[arg] if directive && arg
+          directive = LOG_DIRECTIVES[variable][arg] rescue nil
 
           if directive
             line_regexp << directive[:regexp]   # Parse the value of the directive
             captures    += directive[:captures] # Add the directive's information to the captures
           else
-            puts "%#{directive} log directiven not yet supported, field is ignored."
+            puts "Apache log directive %#{arg}#{variable} is not yet supported by RLA, the field will be ignored."
             line_regexp << '.*' # Just accept any input for this literal
           end
         end
@@ -126,22 +128,11 @@ module RequestLogAnalyzer::FileFormat
         "#{value[7,4]}#{MONTHS[value[3,3]]}#{value[0,2]}#{value[12,2]}#{value[15,2]}#{value[18,2]}".to_i
       end
 
-      # This function can be overridden to rewrite the path for better categorization in the
-      # reports.
-      def convert_path(value, definition)
-        value
-      end
-
       # This function can be overridden to simplify the user agent string for better
       # categorization in the reports
       def convert_user_agent(value, definition)
         value # TODO
       end
-
-      # Make sure that the string '-' is parsed as a nil value.
-      def convert_nillable_string(value, definition)
-        value == '-' ? nil : value
-      end
     end
   end
 end

data/lib/request_log_analyzer/file_format/haproxy.rb

@@ -0,0 +1,138 @@
+module RequestLogAnalyzer::FileFormat
+
+  class Haproxy < RequestLogAnalyzer::FileFormat::Base
+
+    extend CommonRegularExpressions
+
+    # Define line types
+    line_definition :haproxy do |line|
+      line.header = true
+      line.footer = true
+
+      line.regexp = %r{
+        (#{ip_address}):\d+\s # client_ip ':' client_port
+        \[(#{timestamp('%d/%b/%Y:%H:%M:%S')})\.\d{3}\]\s # '[' accept_date ']'
+        (\S+)\s # frontend_name
+        (\S+)\/(\S+)\s # backend_name '/' server_name
+        (\d+|-1)\/(\d+|-1)\/(\d+|-1)\/(\d+|-1)\/\+?(\d+)\s # Tq '/' Tw '/' Tc '/' Tr '/' Tt
+        (\d+)\s # status_code
+        \+?(\d+)\s # bytes_read
+        (\S+)\s # captured_request_cookie
+        (\S+)\s # captured_response_cookie
+        (\w|-)(\w|-)(\w|-)(\w|-)\s # termination_state
+        (\d+)\/(\d+)\/(\d+)\/(\d+)\/\+?(\d+)\s # actconn '/' feconn '/' beconn '/' srv_conn '/' retries
+        (\d+)\/(\d+)\s # srv_queue '/' backend_queue
+        (\S*)\s? # captured_request_headers
+        (\S*)\s? # captured_response_headers
+        "([^"]*)" # '"' http_request '"'
+      }x
+
+      line.capture(:client_ip).as(:string)
+      line.capture(:accept_date).as(:timestamp)
+      line.capture(:frontend_name).as(:string)
+      line.capture(:backend_name).as(:string)
+      line.capture(:server_name).as(:string)
+      line.capture(:tq).as(:nillable_duration, :unit => :msec)
+      line.capture(:tw).as(:nillable_duration, :unit => :msec)
+      line.capture(:tc).as(:nillable_duration, :unit => :msec)
+      line.capture(:tr).as(:nillable_duration, :unit => :msec)
+      line.capture(:tt).as(:duration, :unit => :msec)
+      line.capture(:status_code).as(:integer)
+      line.capture(:bytes_read).as(:traffic, :unit => :byte)
+      line.capture(:captured_request_cookie).as(:nillable_string)
+      line.capture(:captured_response_cookie).as(:nillable_string)
+      line.capture(:termination_event_code).as(:nillable_string)
+      line.capture(:terminated_session_state).as(:nillable_string)
+      line.capture(:clientside_persistence_cookie).as(:nillable_string)
+      line.capture(:serverside_persistence_cookie).as(:nillable_string)
+      line.capture(:actconn).as(:integer)
+      line.capture(:feconn).as(:integer)
+      line.capture(:beconn).as(:integer)
+      line.capture(:srv_conn).as(:integer)
+      line.capture(:retries).as(:integer)
+      line.capture(:srv_queue).as(:integer)
+      line.capture(:backend_queue).as(:integer)
+      line.capture(:captured_request_headers).as(:nillable_string)
+      line.capture(:captured_response_headers).as(:nillable_string)
+      line.capture(:http_request).as(:nillable_string)
+    end
+
+    # Define the summary report
+    report do |analyze|
+      analyze.hourly_spread :field => :accept_date
+
+      analyze.frequency :client_ip,
+        :title => "Hits per IP"
+
+      analyze.frequency :frontend_name,
+        :title => "Hits per frontend service"
+
+      analyze.frequency :backend_name,
+        :title => "Hits per backend service"
+
+      analyze.frequency :server_name,
+        :title => "Hits per backend server"
+
+      analyze.frequency :status_code,
+        :title => "HTTP response code frequency"
+
+      analyze.frequency :http_request,
+        :title => "Most popular requests"
+
+      analyze.frequency :http_request,
+        :title => "Most frequent HTTP 40x errors",
+        :category => lambda { |r| "#{r[:http_request]}"},
+        :if => lambda { |r| r[:status_code] >= 400 and r[:status_code] <= 417 }
+
+      analyze.frequency :http_request,
+        :title => "Most frequent HTTP 50x errors",
+        :category => lambda { |r| "#{r[:http_request]}"},
+        :if => lambda { |r| r[:status_code] >= 500 and r[:status_code] <= 505 }
+
+      analyze.traffic :bytes_read,
+        :title => "Traffic per frontend service",
+        :category => lambda { |r| "#{r[:frontend_name]}"}
+
+      analyze.traffic :bytes_read,
+        :title => "Traffic per backend service",
+        :category => lambda { |r| "#{r[:backend_name]}"}
+
+      analyze.traffic :bytes_read,
+        :title => "Traffic per backend server",
+        :category => lambda { |r| "#{r[:server_name]}"}
+
+      analyze.duration :tr,
+        :title => "Time waiting for backend response",
+        :category => lambda { |r| "#{r[:http_request]}"}
+
+      analyze.duration :tt,
+        :title => "Total time spent on request",
+        :category => lambda { |r| "#{r[:http_request]}"}
+    end
+
+    # Define a custom Request class for the HAProxy file format to speed up
+    # timestamp handling. Shamelessly copied from apache.rb
+    class Request < RequestLogAnalyzer::Request
+
+      MONTHS = {'Jan' => '01', 'Feb' => '02', 'Mar' => '03', 'Apr' => '04', 'May' => '05', 'Jun' => '06',
+                'Jul' => '07', 'Aug' => '08', 'Sep' => '09', 'Oct' => '10', 'Nov' => '11', 'Dec' => '12' }
+
+      # Do not use DateTime.parse, but parse the timestamp ourselves to return
+      # a integer to speed up parsing.
+      def convert_timestamp(value, definition)
+        "#{value[7,4]}#{MONTHS[value[3,3]]}#{value[0,2]}#{value[12,2]}#{value[15,2]}#{value[18,2]}".to_i
+      end
+
+      # Make sure that the strings '-' or '{}' or '' are parsed as a nil value.
+      def convert_nillable_string(value, definition)
+        value =~ /-|\{\}|^$/ ? nil : value
+      end
+
+      # Make sure that -1 is parsed as a nil value.
+      def convert_nillable_duration(value, definition)
+        value == '-1' ? nil : convert_duration(value, definition)
+      end
+
+    end
+  end
+end

data/lib/request_log_analyzer/file_format/postgresql.rb

@@ -1,24 +1,25 @@
 module RequestLogAnalyzer::FileFormat
 
+  # PostgresQL spec 8.3.7
   class Postgresql < Base
 
     extend CommonRegularExpressions
     
     line_definition :query do |line|
       line.header = true
-      line.teaser = /LOG\:  query\:/
-      line.regexp = /(#{timestamp('%y-%m-%d %k:%M:%S')})\ LOG:  query:\s+(.*)/
+      line.teaser = /.*LOG\:/
+      line.regexp = /(#{timestamp('%Y-%m-%d %k:%M:%S')})\ \S+ \[\d+\]\:\ \[.*\]\ LOG\:\ \ \d+\:\ duration\: (.*)\ ms\ \ statement:\ (.*)/
 
       line.capture(:timestamp).as(:timestamp)
+      line.capture(:query_time).as(:duration, :unit => :sec)
       line.capture(:query_fragment)
     end
       
-    line_definition :duration do |line|
+    line_definition :location do |line|
       line.footer = true
-      line.teaser = /duration:/
-      line.regexp = /#{timestamp('%y-%m-%d %k:%M:%S')}\ LOG\:  duration\: (.*)(\ )sec/
+      line.teaser = /.*LOCATION:/
+      line.regexp = /.*(\ )LOCATION:/
 
-      line.capture(:query_time).as(:duration, :unit => :sec)
       line.capture(:query).as(:sql) # Hack to gather up fragments
     end
     

data/lib/request_log_analyzer/file_format/rails3.rb

@@ -36,7 +36,7 @@ module RequestLogAnalyzer::FileFormat
     line_definition :completed do |line|
       line.footer = true
       line.teaser = /Completed /
-      line.regexp = /Completed (\d+)? .*in (\d+(?:\.\d+)?)ms(?:[^\(]*\(Views: (\d+(?:\.\d+)?)ms .* ActiveRecord: (\d+(?:\.\d+)?)ms\))?/
+      line.regexp = /Completed (\d+)? .*in (\d+(?:\.\d+)?)ms(?:[^\(]*\(Views: (\d+(?:\.\d+)?)ms .* ActiveRecord: (\d+(?:\.\d+)?)ms.*\))?/
       
       line.capture(:status).as(:integer)
       line.capture(:duration).as(:duration, :unit => :msec)

data/lib/request_log_analyzer/file_format/w3c.rb

@@ -0,0 +1,56 @@
+module RequestLogAnalyzer::FileFormat
+
+  # FileFormat for W3C access logs.
+  class W3c < Base
+    
+    extend CommonRegularExpressions
+
+    line_definition :access do |line|
+      line.header = true
+      line.footer = true
+      line.regexp = /^(#{timestamp('%Y-%m-%d %H:%M:%S')}) (#{ip_address}) (.*) (#{ip_address}) (\d+) (\w+) ([\w|\/|.]+) \- (\d+) (\d+) (\d+) (\d+) (.*) (\S+)/
+      
+      line.capture(:timestamp).as(:timestamp)
+      line.capture(:remote_ip)
+      line.capture(:username).as(:nillable_string)
+      line.capture(:local_ip)
+      line.capture(:port).as(:integer)
+      line.capture(:method)
+      line.capture(:path).as(:path)
+      line.capture(:http_status).as(:integer)
+      line.capture(:bytes_sent).as(:traffic, :unit => :byte)
+      line.capture(:bytes_received).as(:traffic, :unit => :byte)
+      line.capture(:duration).as(:duration, :unit => :msec)
+      line.capture(:user_agent)
+      line.capture(:referer)
+    end
+
+    report do |analyze|
+      analyze.timespan
+      analyze.hourly_spread
+
+      analyze.frequency :category => :http_method, :title => "HTTP methods"
+      analyze.frequency :category => :http_status, :title => "HTTP statuses"
+      
+      analyze.frequency :category => :path, :title => "Most popular URIs"
+
+      analyze.frequency :category => :user_agent, :title => "User agents"
+      analyze.frequency :category => :referer,    :title => "Referers"
+
+      analyze.duration :duration => :duration,  :category => :path, :title => 'Request duration'
+      analyze.traffic  :traffic => :bytes_sent, :category => :path, :title => 'Traffic out'
+      analyze.traffic  :traffic => :bytes_received, :category => :path, :title => 'Traffic in'
+    end
+    
+    class Request < RequestLogAnalyzer::Request
+      # Do not use DateTime.parse, but parse the timestamp ourselves to return a integer
+      # to speed up parsing.
+      def convert_timestamp(value, definition)
+        "#{value[0,4]}#{value[5,2]}#{value[8,2]}#{value[11,2]}#{value[14,2]}#{value[17,2]}".to_i
+      end
+    end
+    
+
+  end
+  
+end

data/lib/request_log_analyzer/file_format.rb

@@ -13,6 +13,8 @@ module RequestLogAnalyzer::FileFormat
   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'
+  autoload :W3c,              'request_log_analyzer/file_format/w3c'
+  autoload :Haproxy,          'request_log_analyzer/file_format/haproxy'
 
   # Loads a FileFormat::Base subclass instance.
   # You can provide:
@@ -293,4 +295,4 @@ module RequestLogAnalyzer::FileFormat
       return nil
     end
   end
-end
+end

data/lib/request_log_analyzer/request.rb

@@ -27,6 +27,13 @@ module RequestLogAnalyzer
       def convert_integer(value, capture_definition); value.to_i; end
       def convert_sym(value, capture_definition);     value.to_sym; end
       def convert_symbol(value, capture_definition);  value.to_sym; end
+      def convert_nillable_string(value, definition); value == '-' ? nil : value ; end
+      
+      # This function can be overridden to rewrite the path for better categorization in the
+      # reports.
+      def convert_path(value, definition)
+        value
+      end
 
       # Converts :eval field, which should evaluate to a hash.
       def convert_eval(value, capture_definition)

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.9.9"
+  VERSION = "1.10.0"
 
 
   autoload :Controller,     'request_log_analyzer/controller'

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.9.9"
-  s.date    = "2010-12-17"
+  s.version = "1.10.0"
+  s.date    = "2011-02-26"
 
   s.rubyforge_project = 'r-l-a'
 
@@ -39,6 +39,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(.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)
+  s.files      = %w(.gitignore DESIGN.rdoc Gemfile 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/haproxy.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/file_format/w3c.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/haproxy_format_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/file_format/w3c_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/haproxy_format_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/file_format/w3c_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