evidence 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c1b6dbf6bb3b0a59bb56b902ef62834f315e804
-  data.tar.gz: 983e1414221dae85d29c7eafadff2c7fa3d2c1d0
+  metadata.gz: 4b8963748cdd5830802554d79fd26f64037fd13b
+  data.tar.gz: d800a7d498f1a4e2856bdfc5405313b8be4ddb83
 SHA512:
-  metadata.gz: b75c8fdc0a63017250c3412d8e579f64c26f8b603ed4b374b7c7143fdb4d4ceb1d161d7574d7afc238c6ee1af441cb574e48940ca7b670ff8a187ef6655cae27
-  data.tar.gz: c5700202e8e74b13bacb9e8a5ecd0007775e6d8c2c9a8e7355c9dc91d53aa2845c38c2f7fdb91ca54888d5fa5efb396d8854f35e4979231fcc11111b29f0b6a8
+  metadata.gz: 0e070f30317b31e03bd71d73b13a9115c9a12829ff48901c420971eebe682d237014cf6fa790fdd376e2092f060f7edb12001198223432f5c92c6fc8d22674ee
+  data.tar.gz: 8e7a2f25a780c22501a09c8e6fcc05d5a60fcd4d1b387906f487e2403b9d5cc8e5ebc6ed8d0df19dd65fee720efe62af0882b27135d57a882bae3190e10c2d3f

data/lib/evidence/action_parser.rb

@@ -10,14 +10,24 @@ module Evidence
     def to_proc
       lambda do |log|
         pid = @pid[log]
+        msg = @message[log]
         if @processes.has_key?(pid)
-          @processes[pid] << log
-          if end_action?(@message[log])
-            parse_action_logs(@processes.delete(pid))
+          if start_action?(msg)
+            warn "[WARN] Found start action following another start action: #{msg}"
+            warn "[WARN] Ignore logs: #{@processes.delete(pid).inspect}"
+            @processes[pid] = [log]
+            nil
+          else
+            @processes[pid] << log
+            if end_action?(msg)
+              parse_action_logs(@processes.delete(pid))
+            end
           end
         else
-          if start_action?(@message[log])
+          if start_action?(msg)
             @processes[pid] = [log]
+          else
+            warn "[WARN] Ignore a log that is not start action and also not after a start action: #{log.inspect}"
           end
           nil
         end

data/lib/evidence/rails.rb

@@ -5,6 +5,7 @@ module Evidence
           (\#012\#012)?             # ignore encoded newlines
           Processing\s+
           (?<controller>\w+)\#(?<action>\w+)\s+
+          (to\s+(?<format>\w+)\s+)?
           \(for\s+
           (?<remote_addr>[^\s]+)\s+
           at\s+
@@ -14,13 +15,16 @@ module Evidence
       end: /^
           Completed\sin\s
           (?<completed_time>\d+)ms\s+
-          \((View\:\s(?<view_time>\d+))?
-          \s*,?\s*
-          (\s*DB\:\s(?<db_time>\d+))?
-          \)?\s+\|\s+
+          (
+            \(
+                (View\:\s(?<view_time>\d+))?
+                \s*,?\s*
+                (DB\:\s(?<db_time>\d+))?
+            \)?
+          )?\s*\|\s*
           (?<code>\d+)\s+
-          (?<status>\w+)\s+
-          \[(?<url>.+)\]
+          (?<status>[ \w-]+)\s+
+          (?<url>.+)
         $/x
     }
   end

data/lib/evidence.rb

@@ -13,7 +13,9 @@ module Evidence
   def parse_log(pattern)
     lambda do |log|
       if m = pattern.match(log)
-        Hash[m.names.map(&:to_sym).zip(m.captures)]
+        Hash[m.names.map(&:to_sym).zip(m.captures)].tap do |h|
+          h[:origin] = log unless h.has_key?(:origin)
+        end
       end
     end
   end
@@ -39,7 +41,7 @@ module Evidence
     end
   end
 
-  # actions.chunk(&time_window(60))
+  # actions.chunk(&by_time_window(60))
   def by_time_window(time_window, start=nil)
     range = nil
     lambda do |ele|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: evidence
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Xiao Li
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -37,7 +37,6 @@ files:
 - lib/evidence/action_parser.rb
 - lib/evidence/lazy.rb
 - lib/evidence/rails.rb
-- lib/evidence/rails_action_parser.rb
 - lib/evidence.rb
 - examples/mingle_logs_analysis.rb
 homepage: https://github.com/ThoughtWorksStudios/evidence

data/lib/evidence/rails_action_parser.rb

@@ -1,55 +0,0 @@
-module Evidence
-  class ActionParser
-
-    def initialize(pid, message, action_patterns)
-      @pid, @message = pid, message
-      @processes = Hash.new
-      @start_action_pattern, @end_action_pattern = action_patterns[:start], action_patterns[:end]
-    end
-
-    def to_proc
-      lambda do |log|
-        pid = @pid[log]
-        if @processes.has_key?(pid)
-          @processes[pid] << log
-          if end_action?(@message[log])
-            parse_action_logs(@processes.delete(pid))
-          end
-        else
-          if start_action?(@message[log])
-            @processes[pid] = [log]
-          end
-          nil
-        end
-      end
-    end
-
-    def parse_action_logs(logs)
-      {
-        request: request(@message[logs[0]]),
-        response: response(@message[logs[-1]]),
-        logs: logs
-      }
-    end
-
-    def end_action?(msg)
-      msg =~ @end_action_pattern
-    end
-
-    def start_action?(msg)
-      msg =~ @start_action_pattern
-    end
-
-    def request(msg)
-      to_hash(@start_action_pattern.match(msg))
-    end
-
-    def response(msg)
-      to_hash(@end_action_pattern.match(msg))
-    end
-
-    def to_hash(m)
-      Hash[m.names.map(&:to_sym).zip(m.captures)]
-    end
-  end
-end