chainsaw 0.0.7 → 0.0.8

data/README.md

@@ -21,7 +21,7 @@ be found here: https://github.com/mojombo/chronic
     # You can use a hypen to specify a time range (you can mix and match formats)
 
     > chainsaw access.log 2012-08-01 - 2012-09-17     # entries within August 1st and September 17th
-    > chainsaw access.log august - yesterday          # entries within August and September
+    > chainsaw access.log july - yesterday            # entries within July and yesterday
 
 ## Features
 

data/lib/chainsaw/detector.rb

@@ -2,7 +2,7 @@ module Chainsaw
   class Detector
     PATTERNS = {
       :clf =>  {
-        :pattern     => /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} (?:-|[^ ]+) (?:-|[^ ]+) \[(\d{2}\/[a-z]{3}\/\d{4}:\d{2}:\d{2}:\d{2} -\d{4})\]/i,
+        :pattern     => /^\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3} (?:-|[^ ]+) (?:-|[^ ]+) \[(\d{2}\/[a-z]{3}\/\d{4}:\d{2}:\d{2}:\d{2} (-|\+)\d{4})\]/i,
         :time_format => '%d/%b/%Y:%H:%M:%S %z'
       },
       :apache_error => {
@@ -18,7 +18,7 @@ module Chainsaw
         :time_format => '%Y-%m-%dT%H:%M:%S'
       },
       :rails => {
-        :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,
+        :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'
       },
       :syslog => {
@@ -42,12 +42,16 @@ module Chainsaw
         :time_format => '%d/%b/%Y %H:%M:%S'
       },
       :python => {
-        :pattern     => /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})/i,
+        :pattern     => /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2}),\d{3}/i,
         :time_format => '%Y-%m-%d %H:%M:%S'
       },
       :django => {
         :pattern     => /^\[(\d{2}\/[a-z]{3}\/\d{4} \d{2}:\d{2}:\d{2})\]/i,
         :time_format => '%d/%b/%Y %H:%M:%S'
+      },
+      :nslog => {
+        :pattern     => /^(\d{4}-\d{2}-\d{2} \d{2}:\d{2}:\d{2})\.\d{3} [a-z0-9]+\[/i,
+        :time_format => '%Y-%m-%d %H:%M:%S'
       }
     }
 

data/lib/chainsaw/version.rb

@@ -1,3 +1,3 @@
 module Chainsaw
-  VERSION = '0.0.7'
+  VERSION = '0.0.8'
 end

data/test/detector_test.rb

@@ -113,6 +113,14 @@ describe Chainsaw::Detector do
     time.must_equal Time.local(2012, 9, 03, 21, 49, 47)
   end
 
+  it 'detects nslog log format' do
+    line   = get_log_line('nslog.log')
+    format = Detector.detect(line)
+    time   = get_time(line, format)
+
+    format.type.must_equal :nslog
+    time.must_equal Time.local(2012, 8, 30, 04, 54, 48)
+  end
 
   def get_time(line, format)
     timestamp = line.match(format.pattern)[1]

data/test/logs/nslog.log

@@ -0,0 +1,4 @@
+2012-08-30 04:54:48.128 MyApp[94652:a0f] some log message
+2012-08-30 04:54:50.647 MyApp[94652:a0f] another log message
+2012-08-31 04:54:48.128 MyApp[94652:a0f] some log message
+2012-08-31 04:54:50.647 MyApp[94652:a0f] another log message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chainsaw
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chronic
-  requirement: &70200863777840 !ruby/object:Gem::Requirement
+  requirement: &70343402535640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 0.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *70200863777840
+  version_requirements: *70343402535640
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70200863776780 !ruby/object:Gem::Requirement
+  requirement: &70343402535000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70200863776780
+  version_requirements: *70343402535000
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70200863776040 !ruby/object:Gem::Requirement
+  requirement: &70343402534380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *70200863776040
+  version_requirements: *70343402534380
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70200863775260 !ruby/object:Gem::Requirement
+  requirement: &70343402533340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,7 +55,7 @@ dependencies:
         version: 0.11.4
   type: :development
   prerelease: false
-  version_requirements: *70200863775260
+  version_requirements: *70343402533340
 description: Filter logfiles based on a time range
 email:
 - tdunn13@gmail.com
@@ -87,6 +87,7 @@ files:
 - test/logs/django.log
 - test/logs/mongodb.log
 - test/logs/nginx_error.log
+- test/logs/nslog.log
 - test/logs/puppet.log
 - test/logs/python.log
 - test/logs/rack.log
@@ -129,6 +130,7 @@ test_files:
 - test/logs/django.log
 - test/logs/mongodb.log
 - test/logs/nginx_error.log
+- test/logs/nslog.log
 - test/logs/puppet.log
 - test/logs/python.log
 - test/logs/rack.log