request-log-analyzer 1.12.0 → 1.12.1

data/.travis.yml

@@ -1,10 +1,14 @@
+language: ruby
 script: bundle exec rake
 rvm:
   - 1.8.7
-  - 1.9.1
   - 1.9.2
-  - ruby-head
+  - 1.9.3
   - ree
-  - rbx
-  - rbx-2.0
-  - jruby
+  - jruby-18mode
+  #- jruby-19mode
+  #- rbx-18mode
+  #- rbx-19mode
+notifications:
+  email:
+    - info@railsdoctors.com

data/bin/request-log-analyzer

@@ -119,9 +119,9 @@ when :strip
   RequestLogAnalyzer::LogProcessor.build(:strip, arguments).run!
 else
   unless arguments[:silent]
-    puts "Request-log-analyzer, by Willem van Bergen and Bart ten Brinke - version #{RequestLogAnalyzer::VERSION}"
-    puts "Website: http://railsdoctors.com"
-    puts
+    STDERR.puts "Request-log-analyzer, by Willem van Bergen and Bart ten Brinke - version #{RequestLogAnalyzer::VERSION}"
+    STDERR.puts "Website: http://railsdoctors.com"
+    STDERR.puts
   end
 
   # Run the 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.12.0"
+  VERSION = "1.12.1"
 
   # Convert a string/symbol in camelcase ({RequestLogAnalyzer::Controller}) to underscores 
   # (<tt>request_log_analyzer/controller</tt>). This function can be used to load the file (using 

data/lib/request_log_analyzer/aggregator/database_inserter.rb

@@ -35,8 +35,13 @@ module RequestLogAnalyzer::Aggregator
       @request_object = RequestLogAnalyzer::Database::Request.new(:first_lineno => request.first_lineno, :last_lineno => request.last_lineno)
       request.lines.each do |line|
         class_columns = database.get_class(line[:line_type]).column_names.reject { |column| ['id', 'source_id', 'request_id'].include?(column) }
-        attributes = Hash[*line.select { |(k, v)| class_columns.include?(k.to_s) }.flatten]
-        attributes[:source_id] = @sources[line[:source]].id if @sources[line[:source]]
+        attributes = Hash[*line.select { |(k, v)| class_columns.include?(k.to_s)}.flatten]
+        
+        # Fix encoding patch for 1.9.2
+        attributes.each do |k,v|
+          attributes[k] = v.force_encoding("UTF-8") if v.is_a?(String) && "".respond_to?("force_encoding")
+        end
+
         @request_object.send("#{line[:line_type]}_lines").build(attributes)
       end
       @request_object.save!

data/lib/request_log_analyzer/controller.rb

@@ -262,7 +262,7 @@ module RequestLogAnalyzer
     def handle_progress(message, value = nil)
       case message
       when :started
-        @progress_bar = CommandLine::ProgressBar.new(File.basename(value), File.size(value), STDOUT)
+        @progress_bar = CommandLine::ProgressBar.new(File.basename(value), File.size(value), STDERR)
       when :finished
         @progress_bar.finish
         @progress_bar = nil

data/lib/request_log_analyzer/database/base.rb

@@ -9,17 +9,26 @@ class RequestLogAnalyzer::Database::Base < ActiveRecord::Base
       source_comparison
     end
   end
+  
+  # Handle format manually, because it is prohibidado in Rails 3.2.1
+  def format=(arg)
+    self.attributes[:format] = arg
+  end
+  
+  def format(arg)
+    self.attributes[:format]
+  end
 
   def line_type
     self.class.name.underscore.gsub(/_line$/, '').to_sym
   end
 
-  class_inheritable_accessor :line_definition
+  class_attribute :line_definition
   cattr_accessor :database
 
   def self.subclass_from_line_definition(definition)
     klass = Class.new(RequestLogAnalyzer::Database::Base)
-    klass.set_table_name("#{definition.name}_lines")
+    klass.table_name = "#{definition.name}_lines"
 
     klass.line_definition = definition
 
@@ -42,7 +51,7 @@ class RequestLogAnalyzer::Database::Base < ActiveRecord::Base
     raise "Table #{table} not found!" unless database.connection.table_exists?(table)
 
     klass = Class.new(RequestLogAnalyzer::Database::Base)
-    klass.set_table_name(table)
+    klass.table_name = table
 
     if klass.column_names.include?('request_id')
       klass.belongs_to :request, :class_name => RequestLogAnalyzer::Database::Request.name
@@ -75,8 +84,10 @@ class RequestLogAnalyzer::Database::Base < ActiveRecord::Base
         t.column :lineno,     :integer
 
         line_definition.captures.each do |capture|
+          column_name = capture[:name]
+          column_name = 'file_format' if column_name == 'format'
           # Add a field for every capture
-          t.column(capture[:name], column_type(capture[:type]))
+          t.column(column_name, column_type(capture[:type]))
 
           # If the capture provides other field as well, create columns for them, too
           capture[:provides].each { |field, field_type| t.column(field, column_type(field_type)) } if capture[:provides].kind_of?(Hash)

data/lib/request_log_analyzer/database/connection.rb

@@ -13,13 +13,13 @@ module RequestLogAnalyzer::Database::Connection
 
   def connect(connection_identifier)
     if connection_identifier.kind_of?(Hash)
-      RequestLogAnalyzer::Database::Base.establish_connection(connection_identifier)
+      ActiveRecord::Base.establish_connection(connection_identifier)
     elsif connection_identifier == ':memory:'
-      RequestLogAnalyzer::Database::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
+      ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => ':memory:')
     elsif connection_hash = RequestLogAnalyzer::Database::Connection.from_string(connection_identifier)
-      RequestLogAnalyzer::Database::Base.establish_connection(connection_hash)
+      ActiveRecord::Base.establish_connection(connection_hash)
     elsif connection_identifier.kind_of?(String) # Normal SQLite 3 database file
-      RequestLogAnalyzer::Database::Base.establish_connection(:adapter => 'sqlite3', :database => connection_identifier)
+      ActiveRecord::Base.establish_connection(:adapter => 'sqlite3', :database => connection_identifier)
     elsif connection_identifier.nil?
       nil
     else

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.12.0"
-  s.date    = "2012-01-25"
+  s.version = "1.12.1"
+  s.date    = "2012-02-20"
 
   s.rubyforge_project = 'r-l-a'
 
@@ -31,8 +31,14 @@ Gem::Specification.new do |s|
   s.add_development_dependency('rspec', '~> 2.0')
 
   s.add_development_dependency('activerecord')
-  s.add_development_dependency('sqlite3')
 
+  if defined?(JRUBY_VERSION)
+    s.add_development_dependency('jdbc-sqlite3')
+    s.add_development_dependency('activerecord-jdbcsqlite3-adapter')
+  else
+    s.add_development_dependency('sqlite3')
+  end
+  
   s.authors  = ['Willem van Bergen', 'Bart ten Brinke']
   s.email    = ['willem@railsdoctors.com', 'bart@railsdoctors.com']
   s.homepage = 'http://railsdoctors.com'
@@ -41,4 +47,4 @@ Gem::Specification.new do |s|
   # Do not change them by hand, but make sure to add the files to the git repository.
   s.files      = %w(.gitignore .infinity_test .travis.yml 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/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/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/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
+end

data/spec/integration/mailer_spec.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
 require 'socket'
 
+unless defined?(JRUBY_VERSION) #No Fork on JRUBY
+
 describe RequestLogAnalyzer, 'running mailer integration' do
 
   before(:each) do
@@ -193,3 +195,7 @@ class Mailtrap
     write( from, to_list, lines.join( "\n" ) )
   end
 end
+
+else
+  p 'Skipping mailer integration specs, because of missing Process.fork()'
+end

data/spec/unit/database/base_class_spec.rb

@@ -12,7 +12,7 @@ describe RequestLogAnalyzer::Database::Base do
 
     before(:each) do
       @orm_class = mock('Line ActiveRecord::Base class')
-      @orm_class.stub!(:set_table_name)
+      @orm_class.stub!("table_name=")
       @orm_class.stub!(:belongs_to)
       @orm_class.stub!(:serialize)
       @orm_class.stub!(:line_definition=)
@@ -37,7 +37,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should set the table name for the subclass" do
-      @orm_class.should_receive(:set_table_name).with('test_lines')
+      @orm_class.should_receive("table_name=").with('test_lines')
       RequestLogAnalyzer::Database::Base.subclass_from_line_definition(@line_definition)
     end
 
@@ -80,7 +80,7 @@ describe RequestLogAnalyzer::Database::Base do
 
       @klass = mock('ActiveRecord ORM class')
       @klass.stub!(:column_names).and_return(['id', 'request_id', 'source_id', 'lineno', 'duration'])
-      @klass.stub!(:set_table_name)
+      @klass.stub!("table_name=")
       @klass.stub!(:belongs_to)
       Class.stub!(:new).with(RequestLogAnalyzer::Database::Base).and_return(@klass)
     end
@@ -91,7 +91,7 @@ describe RequestLogAnalyzer::Database::Base do
     end
 
     it "should set the table name" do
-      @klass.should_receive(:set_table_name).with('completed_lines')
+      @klass.should_receive("table_name=").with('completed_lines')
       RequestLogAnalyzer::Database::Base.subclass_from_table('completed_lines')
     end
 

metadata

@@ -1,73 +1,80 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: request-log-analyzer
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 1.12.1
   prerelease: 
-  version: 1.12.0
 platform: ruby
-authors: 
+authors:
 - Willem van Bergen
 - Bart ten Brinke
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-25 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-02-20 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70250250928960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70250250928960
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70250247206980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.0"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: activerecord
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70250247206980
+- !ruby/object:Gem::Dependency
+  name: activerecord
+  requirement: &70250247206200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: sqlite3
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70250247206200
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: &70250247205540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-description: "    Request log analyzer's purpose is to find out how your web application is being used, how it performs and to\n    focus your optimization efforts. This tool will parse all requests in the application's log file and aggregate the \n    information. Once it is finished parsing the log file(s), it will show the requests that take op most server time \n    using various metrics. It can also insert all parsed request information into a database so you can roll your own\n    analysis. It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3 access logs and MySQL \n    slow query logs out of the box, but file formats of other applications can easily be supported by supplying an \n    easy to write log file format definition.\n"
-email: 
+  prerelease: false
+  version_requirements: *70250247205540
+description: ! "    Request log analyzer's purpose is to find out how your web application
+  is being used, how it performs and to\n    focus your optimization efforts. This
+  tool will parse all requests in the application's log file and aggregate the \n
+  \   information. Once it is finished parsing the log file(s), it will show the requests
+  that take op most server time \n    using various metrics. It can also insert all
+  parsed request information into a database so you can roll your own\n    analysis.
+  It supports Rails-, Merb- and Rack-based applications logs, Apache and Amazon S3
+  access logs and MySQL \n    slow query logs out of the box, but file formats of
+  other applications can easily be supported by supplying an \n    easy to write log
+  file format definition.\n"
+email:
 - willem@railsdoctors.com
 - bart@railsdoctors.com
-executables: 
+executables:
 - request-log-analyzer
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - .gitignore
 - .infinity_test
 - .travis.yml
@@ -212,37 +219,38 @@ files:
 - tasks/request_log_analyzer.rake
 homepage: http://railsdoctors.com
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --title
 - request-log-analyzer
 - --main
 - README.rdoc
 - --line-numbers
 - --inline-source
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-requirements: 
-- To use the database inserter, ActiveRecord and an appropriate database adapter are required.
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements:
+- To use the database inserter, ActiveRecord and an appropriate database adapter are
+  required.
 rubyforge_project: r-l-a
-rubygems_version: 1.8.15
+rubygems_version: 1.8.10
 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: 
+summary: A command line tool to analyze request logs for Apache, Rails, Merb, MySQL
+  and other web application servers
+test_files:
 - spec/integration/command_line_usage_spec.rb
 - spec/integration/mailer_spec.rb
 - spec/integration/munin_plugins_rails_spec.rb