request-log-analyzer 1.9.7 → 1.9.8

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

data/lib/request_log_analyzer/file_format/delayed_job2.rb

@@ -8,7 +8,7 @@ module RequestLogAnalyzer::FileFormat
     
     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.regexp = /(#{timestamp('%Y-%m-%dT%H:%M:%S%z')}): \* \[Worker\(\S+ host:(\S+) pid:(\d+)\)\] acquired lock on (\S+)/
       
       line.capture(:timestamp).as(:timestamp)
       line.capture(:host)
@@ -18,7 +18,7 @@ module RequestLogAnalyzer::FileFormat
     
     line_definition :job_completed do |line|
       line.footer = true
-      line.regexp = /(#{timestamp('%Y-%m-%dT%H:%M:%S%z')}): \* \[JOB\] \w+ host:(\S+) pid:(\d+) completed after (\d+\.\d+)/
+      line.regexp = /(#{timestamp('%Y-%m-%dT%H:%M:%S%z')}): \* \[JOB\] \S+ host:(\S+) pid:(\d+) completed after (\d+\.\d+)/
       line.capture(:timestamp).as(:timestamp)
       line.capture(:host)
       line.capture(:pid).as(:integer)

data/lib/request_log_analyzer/file_format/delayed_job21.rb

@@ -8,7 +8,7 @@ module RequestLogAnalyzer::FileFormat
     
     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.regexp = /(#{timestamp('%Y-%m-%dT%H:%M:%S%z')}): \[Worker\(\S+ host:(\S+) pid:(\d+)\)\] acquired lock on (\S+)/
       
       line.capture(:timestamp).as(:timestamp)
       line.capture(:host)
@@ -18,7 +18,7 @@ module RequestLogAnalyzer::FileFormat
     
     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.regexp = /(#{timestamp('%Y-%m-%dT%H:%M:%S%z')}): \[Worker\(\S+ host:(\S+) pid:(\d+)\)\] (\S+) completed after (\d+\.\d+)/
       line.capture(:timestamp).as(:timestamp)
       line.capture(:host)
       line.capture(:pid).as(:integer)

data/lib/request_log_analyzer/tracker/numeric_value.rb

@@ -121,10 +121,14 @@ module RequestLogAnalyzer::Tracker
     # Returns all the categories and the tracked duration as a hash than can be exported to YAML
     def to_yaml_object
       return nil if @categories.empty?
+      @categories.each do |cat, info|
+        info[:stddev] = stddev(cat)
+        info[:median] = median(cat) if info[:buckets]
+        info[:interval_95_percent] = percentile_interval(cat, 95) if info[:buckets]
+      end
       @categories
     end
 
-
     # Returns the bucket index for a value
     def bucket_index(value)
       return 0 if value < @min_bucket_value

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.7"
-  s.date    = "2010-10-28"
+  s.version = "1.9.8"
+  s.date    = "2010-12-01"
 
   s.rubyforge_project = 'r-l-a'
 

data/spec/unit/file_format/delayed_job21_format_spec.rb

@@ -18,6 +18,12 @@ describe RequestLogAnalyzer::FileFormat::DelayedJob do
                                     :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888)
     end
 
+    it "should parse a :job_lock line correctly when the worker is one of many" do
+      line = "2010-05-17T17:37:34+0000: [Worker(delayed_job.0 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,

data/spec/unit/file_format/delayed_job2_format_spec.rb

@@ -18,6 +18,12 @@ describe RequestLogAnalyzer::FileFormat::DelayedJob do
                                     :job => 'S3FileJob', :host => 'hostname.co.uk', :pid => 11888)
     end
 
+    it "should parse a :job_lock line correctly when the worker is one of many" do
+      line = "2010-05-17T17:37:34+0000: * [Worker(delayed_job.0 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: * [JOB] delayed_job host:hostname.co.uk pid:11888 completed after 1.0676'
       @file_format.should parse_line(line).as(:job_completed).and_capture(:timestamp => 20100517173735,

data/spec/unit/tracker/numeric_value_tracker_spec.rb

@@ -133,8 +133,11 @@ describe RequestLogAnalyzer::Tracker::NumericValue do
       @tracker.update(request(:category => 'a', :blah => 2))
       @tracker.update(request(:category => 'b', :blah => 3))
       @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)      
+      @tracker.to_yaml_object['a'][:interval_95_percent].member?(2).should be_true
+      @tracker.to_yaml_object['b'].should include(:min => 3, :hits => 1, :max => 3, :mean => 3.0, :sum => 3, :sum_of_squares => 0.0)
+      @tracker.to_yaml_object['b'][:interval_95_percent].should be_true
     end
   end
 

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 9
-  - 7
-  version: 1.9.7
+  - 8
+  version: 1.9.8
 platform: ruby
 authors: 
 - Willem van Bergen
@@ -15,13 +15,14 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-28 00:00:00 -07:00
+date: 2010-12-01 00:00:00 -05: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 
@@ -34,6 +35,7 @@ dependencies:
   name: rspec
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -47,6 +49,7 @@ dependencies:
   name: activerecord
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -59,6 +62,7 @@ dependencies:
   name: sqlite3-ruby
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
@@ -231,6 +235,7 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -238,6 +243,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -247,7 +253,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 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