chainsaw 0.0.10 → 0.0.11

data/lib/chainsaw/cli.rb

@@ -88,7 +88,7 @@ module Chainsaw
 
       starting..ending
     rescue
-      puts "\033[31mUnable to parse `#{args.join(' ')}'. Check \033[0m\033[4mhttps://github.com/mojombo/chronic\033[0m\033[31m to see time formats that chronic supports.\033[32m"
+      puts "\033[31mUnable to parse `#{args.join(' ')}'. Check \033[0m\033[4mhttps://github.com/mojombo/chronic\033[0m\033[31m to see time formats that chronic supports.\033[0m"
       exit
     end
 

data/lib/chainsaw/detector.rb

@@ -21,6 +21,10 @@ module Chainsaw
         :pattern     => /^started [a-z]+ "[^"]+" for \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} at (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2} (-|\+)\d{4})/i,
         :time_format => '%Y-%m-%d %H:%M:%S %z'
       },
+      :rails2 => {
+        :pattern     => /^Processing [\w#]+ \(for \d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} at (\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\) \[[a-z]+\]/i,
+        :time_format => '%Y-%m-%d %H:%M:%S'
+      },
       :syslog => {
         :pattern     => /^([a-z]{3}  ?\d{1,2} \d{2}:\d{2}:\d{2})/i,
         :time_format => '%b %e %H:%M:%S'
@@ -69,9 +73,14 @@ module Chainsaw
       type = nil
 
       PATTERNS.each do |key, value|
-        if line.match(value[:pattern])
-          type = key
-          break
+        begin
+          if line.match(value[:pattern])
+            type = key
+            break
+          end
+        rescue ArgumentError
+          line.encode!("UTF-8", "UTF-8", :invalid => :replace, :undef => :replace, :replace => '?')
+          redo
         end
       end
 

data/lib/chainsaw/filter.rb

@@ -32,7 +32,12 @@ module Chainsaw
           next
         end
 
-        match = line.match(@format.pattern)
+        begin
+          match = line.match(@format.pattern)
+        rescue ArgumentError
+          line.encode!("UTF-8", "UTF-8", :invalid => :replace, :undef => :replace, :replace => '?')
+          redo
+        end
 
         if match
           timestamp = match[1]

data/lib/chainsaw/version.rb

@@ -1,3 +1,3 @@
 module Chainsaw
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 end

data/test/detector_test.rb

@@ -49,6 +49,15 @@ describe Chainsaw::Detector do
     time.must_equal Time.local(2012, 9, 1, 9, 34, 35)
   end
 
+  it 'detects rails 2 log format' do
+    line   = get_log_line('rails2.log')
+    format = Detector.detect(line)
+    time   = get_time(line, format)
+
+    format.type.must_equal :rails2
+    time.must_equal Time.local(2012, 10, 25, 18, 6, 13)
+  end
+
   it 'detects syslog log format' do
     line   = get_log_line('syslog.log')
     format = Detector.detect(line)
@@ -122,6 +131,11 @@ describe Chainsaw::Detector do
     time.must_equal Time.local(2012, 8, 30, 04, 54, 48)
   end
 
+  it 'catches invalid byte sequence in UTF-8 (ArgumentError) error' do
+    log_line_including_invalid_byte_sequence = File.open(File.expand_path("../logs/rails_invalid_byte_sequence.log", __FILE__)).readlines[2]
+    proc { Detector.get_type(log_line_including_invalid_byte_sequence) }.must_be_silent
+  end
+
   def get_time(line, format)
     timestamp = line.match(format.pattern)[1]
     time      = Filter.parse_timestamp(timestamp, format.time_format)

data/test/filter_test.rb

@@ -80,4 +80,15 @@ describe Chainsaw::Filter do
     File.open(output_file).first.must_equal "127.0.0.1 - - [30/Aug/2012:15:00:28 -0400] \"HEAD / HTTP/1.1\" 200 338 \"-\" \"Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.19 (KHTML, like Gecko) Ubuntu/12.04 Chromium/18.0.1025.168 Chrome/18.0.1025.168 Safari/535.19\"\n"
     File.delete(output_file)
   end
+
+  it 'catches invalid byte sequence in UTF-8 (ArgumentError) error' do
+    logfile  = File.expand_path('../logs/rails_invalid_byte_sequence.log', __FILE__)
+    starting = Time.local(2012, 8, 30, 10, 51, 05)
+    ending   = Time.now
+    filter   = Filter.new(logfile, starting..ending)
+
+    out, err = capture_io { filter.start }
+    out.wont_include 'ArgumentError: invalid byte sequence in UTF-8'
+    err.wont_include 'ArgumentError: invalid byte sequence in UTF-8'
+  end
 end

data/test/logs/rails2.log

@@ -0,0 +1,24 @@
+Processing HomeController#index (for 127.0.0.1 at 2012-10-25 18:06:13) [GET]
+Rendering home/index
+Completed in 9ms (View: 7, DB: 0) | 200 OK [http://0.0.0.0/]
+SQL (0.1ms)  SET NAMES 'utf8'
+SQL (0.1ms)  SET SQL_AUTO_IS_NULL=0
+
+
+Processing HomeController#index (for 127.0.0.1 at 2012-10-25 18:06:14) [GET]
+Rendering home/index
+Completed in 1ms (View: 0, DB: 0) | 200 OK [http://0.0.0.0/]
+SQL (0.1ms)  SET NAMES 'utf8'
+SQL (0.1ms)  SET SQL_AUTO_IS_NULL=0
+
+
+Processing ApplicationController#index (for 127.0.0.1 at 2012-10-25 18:06:16) [GET]
+
+ActionController::RoutingError (No route matches "/foo" with {:method=>:get}):
+  /Users/usr0600121/.rbenv/versions/ree-1.8.7-2012.02/lib/ruby/1.8/webrick/httpserver.rb:104:in `service'
+  /Users/usr0600121/.rbenv/versions/ree-1.8.7-2012.02/lib/ruby/1.8/webrick/httpserver.rb:65:in `run'
+  /Users/usr0600121/.rbenv/versions/ree-1.8.7-2012.02/lib/ruby/1.8/webrick/server.rb:173:in `start_thread'
+  /Users/usr0600121/.rbenv/versions/ree-1.8.7-2012.02/lib/ruby/1.8/webrick/server.rb:162:in `start'
+  /Users/usr0600121/.rbenv/versions/ree-1.8.7-2012.02/lib/ruby/1.8/webrick/server.rb:162
+
+Rendering rescues/layout (not_found)

data/test/logs/rails_invalid_byte_sequence.log

@@ -0,0 +1,5 @@
+Started GET "/top/index" for 127.0.0.1 at 2012-10-25 23:01:11 +0900
+Processing by TopController#index as */*
+  Parameters: {"body"=>"����ɂ��͐��E�I"}
+  Rendered top/index.html.erb within layouts/application (0.3ms)
+Completed 200 OK in 58ms (Views: 57.4ms | ActiveRecord: 0.0ms)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chainsaw
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-05 00:00:00.000000000 Z
+date: 2012-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
@@ -112,6 +112,8 @@ files:
 - test/logs/python.log
 - test/logs/rack.log
 - test/logs/rails.log
+- test/logs/rails2.log
+- test/logs/rails_invalid_byte_sequence.log
 - test/logs/redis.log
 - test/logs/ruby_logger.log
 - test/logs/syslog.log
@@ -155,6 +157,8 @@ test_files:
 - test/logs/python.log
 - test/logs/rack.log
 - test/logs/rails.log
+- test/logs/rails2.log
+- test/logs/rails_invalid_byte_sequence.log
 - test/logs/redis.log
 - test/logs/ruby_logger.log
 - test/logs/syslog.log