steno 0.0.17 → 0.0.20

data/bin/steno-prettify

@@ -9,13 +9,18 @@ Signal.trap("INT") { exit }
 
 def prettify_io(io, prettifier, ignore_parse_error = false)
   lineno = 0
+  json_regex = '([^{]*)({.*})'
 
   io.sync = true
 
   io.each_line do |line|
     begin
-      prettified = prettifier.prettify_line(line)
-      print prettified
+      match_data = line.match(json_regex)
+      prefix = match_data[1]
+      json = match_data[2]
+
+      prettified = prettifier.prettify_line(json)
+      print prefix + prettified
     rescue Steno::JsonPrettifier::ParseError => e
       if ignore_parse_error
         print line

data/lib/steno/json_prettifier.rb

@@ -9,6 +9,7 @@ end
 class Steno::JsonPrettifier
   FIELD_ORDER = %w[timestamp source process_id thread_id fiber_id location data
                    log_level message]
+  MIN_COL_WIDTH = 14
 
   class ParseError < StandardError
   end
@@ -16,6 +17,7 @@ class Steno::JsonPrettifier
   def initialize(excluded_fields = [])
     @time_format = "%Y-%m-%d %H:%M:%S.%6N"
     @excluded_fields = Set.new(excluded_fields)
+    @max_src_len = MIN_COL_WIDTH
   end
 
   def prettify_line(line)
@@ -63,7 +65,8 @@ class Steno::JsonPrettifier
   end
 
   def format_source(record)
-    "%14s" % record["source"]
+    @max_src_len = [@max_src_len, record["source"].length].max
+    record["source"].ljust(@max_src_len)
   end
 
   def format_process_id(record)

data/lib/steno/sink/syslog.rb

@@ -7,6 +7,8 @@ require "syslog"
 class Steno::Sink::Syslog < Steno::Sink::Base
   include Singleton
 
+  MAX_MESSAGE_SIZE = 1024 * 3
+
   LOG_LEVEL_MAP = {
       :fatal  => Syslog::LOG_CRIT,
       :error  => Syslog::LOG_ERR,
@@ -30,6 +32,7 @@ class Steno::Sink::Syslog < Steno::Sink::Base
   end
 
   def add_record(record)
+    record = truncate_record(record)
     msg = @codec.encode_record(record)
     pri = LOG_LEVEL_MAP[record.log_level.name]
     @syslog_lock.synchronize { @syslog.log(pri, "%s", msg) }
@@ -38,4 +41,16 @@ class Steno::Sink::Syslog < Steno::Sink::Base
   def flush
     nil
   end
+  private
+
+  def truncate_record(record)
+    return record if record.message.size <= MAX_MESSAGE_SIZE
+
+    truncated = record.message.slice(0..(MAX_MESSAGE_SIZE - 1))
+    truncated << "..."
+    Steno::Record.new(record.source, record.log_level,
+                      truncated,
+                      [record.file, record.lineno, record.method],
+                      record.data)
+  end
 end

data/lib/steno/version.rb

@@ -1,3 +1,3 @@
 module Steno
-  VERSION = "0.0.17"
+  VERSION = "0.0.20"
 end

data/spec/unit/json_prettifier_spec.rb

@@ -28,6 +28,42 @@ describe Steno::JsonPrettifier do
       prettified.should match(exp_regex)
     end
 
+    it "should always use the largest src len to determine src column width" do
+      test_srcs = [
+        'a' * (Steno::JsonPrettifier::MIN_COL_WIDTH - 3),
+        'a' * (Steno::JsonPrettifier::MIN_COL_WIDTH - 1),
+        'a' * (Steno::JsonPrettifier::MIN_COL_WIDTH),
+        'a' * (Steno::JsonPrettifier::MIN_COL_WIDTH + 1),
+        'a' * (Steno::JsonPrettifier::MIN_COL_WIDTH - 3),
+        'a' * (Steno::JsonPrettifier::MIN_COL_WIDTH + 3),
+        'a' * (Steno::JsonPrettifier::MIN_COL_WIDTH - 2),
+        'a' * (Steno::JsonPrettifier::MIN_COL_WIDTH + 2)
+      ]
+
+      regex = ['\d{4}-\d{2}-\d{2}',        # YYYY-MM-DD
+               '\d{2}:\d{2}:\d{2}\.\d{6}', # HH:MM:SS.uS
+               '([a-zA-Z0-9\ ]+)',         # Source (to be captured)
+               'pid=\d+',                  # Process id
+               '.+'                        # Everything else
+      ].join("\s") + "\n"
+
+      max_src_len = Steno::JsonPrettifier::MIN_COL_WIDTH
+      test_srcs.each do |src|
+        record = Steno::Record.new(src,
+                                   :info,
+                                   "message",
+                                   ["filename", "line", "method"],
+                                   "test" => "data")
+
+        encoded = codec.encode_record(record)
+        prettified = prettifier.prettify_line(encoded)
+        src_col = prettified.match(regex)[1]
+
+        max_src_len = [max_src_len, src.length].max
+        src_col.length.should == max_src_len
+      end
+    end
+
     it "should raise a parse error when the json-encoded string is not a hash" do
       expect {
         prettifier.prettify_line("[1,2,3]")

data/spec/unit/record_spec.rb

@@ -23,4 +23,8 @@ describe Steno::Record do
   it "should stringify the message" do
     record.message.should be_a(String)
   end
+
+  it "should use a UTC timestamp" do
+    record.timestamp.to_f.should be_within(0.1).of(Time.now.utc.to_f)
+  end
 end

data/spec/unit/sink/syslog_spec.rb

@@ -9,6 +9,11 @@ describe Steno::Sink::Syslog do
     Steno::Record.new("source", level, "message")
   end
 
+  let(:record_with_big_message) do
+    Steno::Record.new("source", level,
+                      "a" * (Steno::Sink::Syslog::MAX_MESSAGE_SIZE + 1))
+  end
+
   describe "#add_record" do
     it "should append an encoded record with the correct priority" do
       identity = "test"
@@ -29,6 +34,35 @@ describe Steno::Sink::Syslog do
 
       sink.add_record(record)
     end
+
+    it "should truncate the record message if its greater than than allowed size" do
+      identity = "test"
+
+      syslog = mock("syslog")
+      Syslog.should_receive(:open) \
+            .with(identity, Syslog::LOG_PID, Syslog::LOG_USER) \
+            .and_return(syslog)
+
+      sink = Steno::Sink::Syslog.instance
+      sink.open(identity)
+
+      truncated = record_with_big_message.message.
+        slice(0..(Steno::Sink::Syslog::MAX_MESSAGE_SIZE) - 1)
+      truncated << "..."
+      codec = mock("codec")
+      codec.should_receive(:encode_record) do |*args|
+        args.size.should == 1
+        args[0].message.should == truncated
+
+        next args[0].message
+      end
+
+      sink.codec = codec
+
+      syslog.should_receive(:log).with(Syslog::LOG_INFO, "%s", truncated)
+
+      sink.add_record(record_with_big_message)
+    end
   end
 
   describe "#flush" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: steno
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.20
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-31 00:00:00.000000000Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grape
-  requirement: &16549780 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *16549780
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &16533020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +37,15 @@ dependencies:
         version: '1.0'
   type: :runtime
   prerelease: false
-  version_requirements: *16533020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
-  requirement: &16532600 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16532600
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &16531900 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16531900
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &16531220 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16531220
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &16530580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +101,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *16530580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A thread-safe logging library designed to support multiple log destinations.
 email:
 - mpage@rbcon.com
@@ -85,47 +115,47 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- bin/steno-prettify
+- lib/steno/codec/base.rb
+- lib/steno/codec/json.rb
+- lib/steno/codec.rb
+- lib/steno/config.rb
+- lib/steno/context.rb
+- lib/steno/core_ext.rb
+- lib/steno/errors.rb
+- lib/steno/http_handler.rb
+- lib/steno/json_prettifier.rb
+- lib/steno/log_level.rb
+- lib/steno/logger.rb
+- lib/steno/record.rb
+- lib/steno/sink/base.rb
+- lib/steno/sink/io.rb
+- lib/steno/sink/syslog.rb
+- lib/steno/sink.rb
+- lib/steno/tagged_logger.rb
+- lib/steno/version.rb
+- lib/steno.rb
+- LICENSE
 - Rakefile
+- README.md
+- spec/spec_helper.rb
+- spec/support/barrier.rb
 - spec/support/null_sink.rb
 - spec/support/shared_context_specs.rb
-- spec/support/barrier.rb
-- spec/spec_helper.rb
-- spec/unit/context_spec.rb
-- spec/unit/steno_spec.rb
-- spec/unit/json_prettifier_spec.rb
 - spec/unit/config_spec.rb
+- spec/unit/context_spec.rb
 - spec/unit/core_ext_spec.rb
-- spec/unit/record_spec.rb
-- spec/unit/logger_spec.rb
-- spec/unit/log_level_spec.rb
 - spec/unit/http_handler_spec.rb
 - spec/unit/json_codec_spec.rb
-- spec/unit/sink/syslog_spec.rb
+- spec/unit/json_prettifier_spec.rb
+- spec/unit/log_level_spec.rb
+- spec/unit/logger_spec.rb
+- spec/unit/record_spec.rb
 - spec/unit/sink/io_spec.rb
+- spec/unit/sink/syslog_spec.rb
+- spec/unit/steno_spec.rb
 - spec/unit/tagged_logger_spec.rb
-- lib/steno/tagged_logger.rb
-- lib/steno/config.rb
-- lib/steno/codec.rb
-- lib/steno/logger.rb
-- lib/steno/context.rb
-- lib/steno/version.rb
-- lib/steno/log_level.rb
-- lib/steno/http_handler.rb
-- lib/steno/errors.rb
-- lib/steno/core_ext.rb
-- lib/steno/record.rb
-- lib/steno/sink.rb
-- lib/steno/json_prettifier.rb
-- lib/steno/sink/io.rb
-- lib/steno/sink/syslog.rb
-- lib/steno/sink/base.rb
-- lib/steno/codec/json.rb
-- lib/steno/codec/base.rb
-- lib/steno.rb
-- README.md
-- LICENSE
 - steno.gemspec
-- bin/steno-prettify
 homepage: http://www.cloudfoundry.org
 licenses: []
 post_install_message: 
@@ -146,25 +176,26 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A logging library.
 test_files:
+- spec/spec_helper.rb
+- spec/support/barrier.rb
 - spec/support/null_sink.rb
 - spec/support/shared_context_specs.rb
-- spec/support/barrier.rb
-- spec/spec_helper.rb
-- spec/unit/context_spec.rb
-- spec/unit/steno_spec.rb
-- spec/unit/json_prettifier_spec.rb
 - spec/unit/config_spec.rb
+- spec/unit/context_spec.rb
 - spec/unit/core_ext_spec.rb
-- spec/unit/record_spec.rb
-- spec/unit/logger_spec.rb
-- spec/unit/log_level_spec.rb
 - spec/unit/http_handler_spec.rb
 - spec/unit/json_codec_spec.rb
-- spec/unit/sink/syslog_spec.rb
+- spec/unit/json_prettifier_spec.rb
+- spec/unit/log_level_spec.rb
+- spec/unit/logger_spec.rb
+- spec/unit/record_spec.rb
 - spec/unit/sink/io_spec.rb
+- spec/unit/sink/syslog_spec.rb
+- spec/unit/steno_spec.rb
 - spec/unit/tagged_logger_spec.rb
+has_rdoc: