rawk_log 2.2.2 → 2.3.0

data/lib/rawk_log/command.rb

@@ -32,6 +32,7 @@ module RawkLog
     def initialize(args)
       @start_time = Time.now
       build_arg_hash(args)
+      @new_log_format = nil
     end
 
     def run
@@ -112,57 +113,60 @@ module RawkLog
         
         # Old: Completed in 0.45141 (2 reqs/sec) | Rendering: 0.25965 (57%) | DB: 0.06300 (13%) | 200 OK [http://localhost/jury/proposal/312]
         # New:  Completed in 100ms (View: 40, DB: 4) 
-        unless defined? @new_log_format
-          @new_log_format = $_ =~ /Completed in \d+ms/ 
+        if @new_log_format.nil?
+          @new_log_format = ! ($_ =~ /Completed in \d+ms/)
         end
         
         if @new_log_format
           if @db_time
-            time_string = $_[/DB: \d+/]
+            time_string = $_[/DB: \d+\.\d+/]
           elsif @render_time
-            time_string = $_[/View: \d+/]
+            time_string = $_[/(View|Rendering): \d+\.\d+/]
           else
-            time_string = $_[/Completed in \d+ms/]
+            time_string = $_[/Completed in \d+\.\d+/]
           end
-          time_string = time_string[/\d+/] if time_string
-          time = time_string.to_i if time_string
+          time_string = time_string[/\d+\.\d+/] if time_string
+          time = time_string.to_f if time_string
         else
           if @db_time
-            time_string = $_[/DB: \d+\.\d+/]
+            time_string = $_[/DB: \d+/]
           elsif @render_time
-            time_string = $_[/Rendering: \d+\.\d+/]
+            time_string = $_[/View: \d+/]
           else
-            time_string = $_[/Completed in \d+\.\d+/]
+            time_string = $_[/Completed in \d+ms/]
           end
-          time_string = time_string[/\d+\.\d+/] if time_string
-          time = time_string.to_f if time_string
+          time_string = time_string[/\d+/] if time_string
+          time = time_string.to_i if time_string
         end
+
         
         
         #if pids are not specified then we use the url for hashing
         #the below regexp turns "[http://spongecell.com/calendar/view/bob]" to "/calendar/view"
         unless key
+          uri = $_[/\[[^\]]+\]/]
+          if uri and uri != ''
+            key = if @force_url_use
+              (uri.gsub(/\S+\/\/(\w|\.)*/,''))[/[^\?\]]*/]
+            else
+              data = uri.gsub(/\S+\/\/(\w|\.)*/,'')
+              s = data.gsub(/(\?.*)|\]$/,'').split("/")
 
-          key = if @force_url_use
-            ($_[/\[[^\]]+\]/].gsub(/\S+\/\/(\w|\.)*/,''))[/[^\?\]]*/]
-          else
-            data = $_[/\[[^\]]+\]/].gsub(/\S+\/\/(\w|\.)*/,'')
-            s = data.gsub(/(\?.*)|\]$/,'').split("/")
-
-            keywords = s.inject([]) do |keywords, word|
-              if is_id?(word.to_s)
-                keywords << '{ID}'
-              elsif !word.to_s.empty?
-                keywords << word.to_s
+              keywords = s.inject([]) do |keywords, word|
+                if is_id?(word.to_s)
+                  keywords << '{ID}'
+                elsif !word.to_s.empty?
+                  keywords << word.to_s
+                end
+                keywords
               end
-              keywords
+              keywords[-1] = '{filename}' if ! keywords.empty? and is_filename?(keywords[-1])
+              k = "/#{keywords.join("/")}"
             end
-            keywords[-1] = '{filename}' if ! keywords.empty? and is_filename?(keywords[-1])
-            k = "/#{keywords.join("/")}"
           end
         end
 
-        if (@from.nil? or @from <= date) and (@to.nil? or @to >= date) # date criteria here
+        if key and (@from.nil? or @from <= date) and (@to.nil? or @to >= date) # date criteria here
           @stat_hash.add(key,time)
           @total_stat.add(time)
           if @worst_requests.length<@worst_request_length || @worst_requests[@worst_request_length-1][0]<time
@@ -177,7 +181,7 @@ module RawkLog
       title = "Log Analysis of #{@db_time ? 'DB' : @render_time ? 'render' : 'total'} request times#{@from ? %Q( from #{@from.to_s}) : ""}#{@to ? %Q( through #{@to.to_s}) : ""}"
       puts title
       puts "=" * title.size
-      puts ""
+      puts "(Times are in milliseconds except where indicated)\n"
       label_size = @stat_hash.print()
       if @stat_hash.empty?
         puts @total_stat.header(label_size)

data/lib/rawk_log/stat.rb

@@ -4,8 +4,7 @@ module RawkLog
 
     DEFAULT_LABEL_SIZE = 30
 
-    HEADER                = "Count       Sum     Max  Median     Avg     Min     Std"
-    HEADER_NEW_LOG_FORMAT = "Count    Sum(s)     Max  Median     Avg     Min     Std"
+    HEADER = "Count Sum(secs)     Max  Median     Avg     Min     Std"
 
     def initialize(key)
       @key=key
@@ -31,8 +30,7 @@ module RawkLog
     end
 
     def header(label_size = DEFAULT_LABEL_SIZE)
-      header = @new_log_format ?  HEADER_NEW_LOG_FORMAT : HEADER
-      sprintf "%*s  %s" % [-label_size, "Request", header]
+      sprintf "%*s  %s" % [-label_size, "Request", HEADER]
     end
 
     def key
@@ -78,7 +76,8 @@ module RawkLog
         if @new_log_format
           sprintf("%*s %6d %9.2f %7d %7d %7d %7d %7d",-label_size, key,count,(sum.to_f/1000),max,median,average,min,standard_deviation)
         else
-          sprintf("%*s %6d %9.2f %7.2f %7.2f %7.2f %7.2f %7.2f",-label_size,key,count,sum,max,median,average,min,standard_deviation)
+          sprintf("%*s %6d %9.2f %7d %7d %7d %7d %7d",-label_size, key,count,sum,max*1000.0,median*1000.0,average*1000.0,min*1000.0,standard_deviation*1000.0)
+          #sprintf("%*s %6d %9.2f %7.2f %7.2f %7.2f %7.2f %7.2f",-label_size,key,count,sum,max,median,average,min,standard_deviation)
         end
       else
           sprintf("%*s %6d",-label_size,key,0)

data/lib/rawk_log/version.rb

@@ -1,3 +1,3 @@
 module RawkLog
-  VERSION = "2.2.2"
+  VERSION = "2.3.0"
 end

data/test/empty_test.rb

@@ -10,7 +10,7 @@ class EmptyTest < Test::Unit::TestCase
   end
 
   def test_outputs_header
-    assert_match(/^Request +Count +Sum +Max +Median +Avg +Min +Std$/, @output)
+    assert_match(/^Request +Count +Sum\(secs\) +Max +Median +Avg +Min +Std$/, @output)
   end
 
   def test_lists_zero_entries

data/test/examples/rails23.log

@@ -28,3 +28,4 @@ Completed in 5ms (View: 2, DB: 0) | 200 OK [http://0.0.0.0/items]
 Processing DocumentController#download (for 12.13.14.15 at 2012-12-13 11:49:03) [GET]
 Completed in 936ms (View: 1, DB: 31) | 200 OK [http://www.example.com/document/download/96164/Form 6 - Occupancy permit-2034-20156 - Unit 1.docx]
 
+Completed in 0.03599 (27 reqs/sec) | Rendering: 0.02954 (82%) | DB: 0.00196 (5%) | 200 OK [http://www.exampl

data/test/mixed_rails40_test.rb

@@ -14,7 +14,7 @@ class MixedRails40Test < Test::Unit::TestCase
   end
 
   def test_outputs_header
-    assert_match(/^Request +Count +Sum +Max +Median +Avg +Min +Std$/, @output)
+    assert_match(/^Request +Count +Sum\(secs\) +Max +Median +Avg +Min +Std$/, @output)
   end
 
   def test_has_top_lists

data/test/rails23_test.rb

@@ -18,7 +18,7 @@ class Rails23Test < Test::Unit::TestCase
   end
 
   def test_outputs_header
-    assert_match(/^Request +Count +Sum\(s\) +Max +Median +Avg +Min +Std$/, @output)
+    assert_match(/^Request +Count +Sum\(secs\) +Max +Median +Avg +Min +Std$/, @output)
   end
 
   def test_finds_entries

data/test/rails40_test.rb

@@ -18,7 +18,7 @@ class Rails40Test < Test::Unit::TestCase
   end
 
   def test_outputs_header
-    assert_match(/^Request +Count +Sum +Max +Median +Avg +Min +Std$/, @output)
+    assert_match(/^Request +Count +Sum\(secs\) +Max +Median +Avg +Min +Std$/, @output)
   end
 
   def test_finds_entries

data/test/unknown_test.rb

@@ -10,7 +10,7 @@ class UnknownTest < Test::Unit::TestCase
   end
 
   def test_outputs_header
-    assert_match(/^Request +Count +Sum +Max +Median +Avg +Min +Std$/, @output)
+    assert_match(/^Request +Count +Sum\(secs\) +Max +Median +Avg +Min +Std$/, @output)
   end
 
   def test_no_top_lists

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rawk_log
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors: