request-log-analyzer 1.9.0 → 1.9.1

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

data/lib/request_log_analyzer/file_format/oink.rb

@@ -2,33 +2,33 @@ class RequestLogAnalyzer::FileFormat::Oink < RequestLogAnalyzer::FileFormat::Rai
   # capture the PID
   HODEL3000_PROCESSING = /\[(\d+)\]: Processing ((?:\w+::)*\w+)#(\w+)(?: to (\w+))? \(for (#{ip_address}) at (#{timestamp('%Y-%m-%d %H:%M:%S')})\) \[([A-Z]+)\]/
   
-  LINE_DEFINITIONS[:processing] = RequestLogAnalyzer::LineDefinition.new(:processing, :header => true,
-          :teaser   => /Processing /,
-          :regexp   => Regexp.union(LINE_DEFINITIONS[:processing].regexp,HODEL3000_PROCESSING),
-          :captures => [{ :name => :controller, :type  => :string }, # Default Rails Processing
+  # TODO: fix me!
+  line_definition :processing do |line|
+    line.header = true
+    line.regexp = Regexp.union(LINE_DEFINITIONS[:processing].regexp,HODEL3000_PROCESSING)
+    line.captures = [   { :name => :controller, :type  => :string }, # Default Rails Processing
                         { :name => :action,     :type  => :string },
                         { :name => :format,     :type  => :string, :default => 'html' },
                         { :name => :ip,         :type  => :string },
                         { :name => :timestamp,  :type  => :timestamp },
                         { :name => :method,     :type  => :string },
-                        { :name => :pid, :type => :integer },        # Hodel 3000 Processing w/PID
+                        { :name => :pid,        :type  => :integer }, # Hodel 3000 Processing w/PID
                         { :name => :controller, :type  => :string },
                         { :name => :action,     :type  => :string },
                         { :name => :format,     :type  => :string, :default => 'html' },
                         { :name => :ip,         :type  => :string },
                         { :name => :timestamp,  :type  => :timestamp },
-                        { :name => :method,     :type  => :string }])
-  
-  # capture the memory usage
-  LINE_DEFINITIONS[:memory_usage] = RequestLogAnalyzer::LineDefinition.new(:memory_usage,
-   :regexp   => /\[(\d+)\]: Memory usage: (\d+) /,
-   :captures => [{ :name => :pid, :type => :integer },{ :name => :memory, :type => :traffic }])
+                        { :name => :method,     :type  => :string }]
+  end
   
-  # capture :memory usage in all line collections
-  LINE_COLLECTIONS.each { |k,v| LINE_COLLECTIONS[k] << :memory_usage }
+  line_definition :memory_usage do |line|
+    line.regexp   = /\[(\d+)\]: Memory usage: (\d+)/
+    line.capture(:pid).as(:integer)
+    line.capture(:memory).as(:traffic)
+  end
   
   report(:append) do |analyze|
-      analyze.traffic :memory_diff, :category => REQUEST_CATEGORIZER, :title => "Largest Memory Increases", :line_type => :memory_usage
+    analyze.traffic :memory_diff, :category => REQUEST_CATEGORIZER, :title => "Largest Memory Increases", :line_type => :memory_usage
   end
   
   # Keep a record of PIDs and their memory usage when validating requests.

data/lib/request_log_analyzer/file_format/rails.rb

@@ -25,9 +25,9 @@ module RequestLogAnalyzer::FileFormat
       lines.each do |line|
         line = line.to_sym
         if LINE_COLLECTIONS.has_key?(line)
-          LINE_COLLECTIONS[line].each { |l| definitions_hash[l] = LINE_DEFINITIONS[l] }
+          LINE_COLLECTIONS[line].each { |l| definitions_hash[l] ||= LINE_DEFINITIONS[l] }
         elsif LINE_DEFINITIONS.has_key?(line)
-          definitions_hash[line] = LINE_DEFINITIONS[line]
+          definitions_hash[line] ||= LINE_DEFINITIONS[line]
         else
           raise "Unrecognized Rails log line name: #{line.inspect}!"
         end

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.0"
-  s.date    = "2010-09-26"
+  s.version = "1.9.1"
+  s.date    = "2010-09-29"
 
   s.rubyforge_project = 'r-l-a'
 
@@ -29,13 +29,9 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency('rake')
   s.add_development_dependency('rspec')
-  
+
   s.add_development_dependency('activerecord')
   s.add_development_dependency('sqlite3-ruby')
-  
-  s.add_development_dependency('git')
-  s.add_development_dependency('gemcutter')
-  
 
   s.authors  = ['Willem van Bergen', 'Bart ten Brinke']
   s.email    = ['willem@railsdoctors.com', 'bart@railsdoctors.com']

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: request-log-analyzer
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: false
   segments: 
   - 1
   - 9
-  - 0
-  version: 1.9.0
+  - 1
+  version: 1.9.1
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-26 00:00:00 +02:00
+date: 2010-09-29 00:00:00 +02:00
 default_executable: request-log-analyzer
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -75,34 +75,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: git
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: gemcutter
-  prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id006
 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