Merge f79cf63 into 84ef7bf

script/extract_log

@@ -39,7 +39,7 @@ def print_match(bundle, strings, found)
   strings.each do |string|
     if bundle.join.include?(string)
       found[string] = true
-      puts bundle.join
+      puts(bundle.map { |line| line.sub(/^[A-Z], \[[^\[\]]*\]  /, "") }.join)
     end
   end
 end
@@ -54,9 +54,9 @@ File.open(file).readlines.each do |line|
     bundles[pid] = []
   end
   bundles[pid] ||= []
-  bundles[pid] << line.sub(/^[A-Z], \[[^\[\]]*\]  /, "")
+  bundles[pid] << line
 end
-bundles.each do |pid, bundle|
+bundles.each_value do |bundle|
   print_match(bundle, strings, found)
 end
 

script/parse_log

@@ -20,7 +20,7 @@ new_errors=$app_root/log/errors.new
 
 grep -A1 '^E, .* ERROR \|ENOMEM' $rails_log |
 grep -v '^--' |
-grep -v '^E, ' |
+grep -v '^[EW], ' |
 grep -v 'Using a password on the command line' |
 grep -v 'Can.t figure out how to sort' |
 grep -v 'SMTP To address may not contain CR or LF line breaks' |