steno 1.2.2 → 1.2.4

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ODVjZjY5ZmYzYzM3NGFhMDlkMWYxYWM5MjAzYTI0MThlNzRiMTViOQ==
+    MmJiYWIyYzUzZjdlZjk2YzIwY2Q3ZDk5YTY4NTgxYzE4OWQ4MGJiZA==
   data.tar.gz: !binary |-
-    N2ZmNDRjYWVlNjE0ODk0YTk5NTI5NGM1ZTU4MDk5NWZjNmE5Y2UzYg==
-!binary "U0hBNTEy":
+    MzUzMjIwZTNjYTAzYWIyZDE2MmNmNTNiOTBkMzIzZmRiMDJmMGFkOQ==
+SHA512:
   metadata.gz: !binary |-
-    ZGZjN2I5ZDQ1NGNkNWI3ZDJkNzU1Mzk5YTlmOGNhOWI2NmMyNTJiMGY3ZGEy
-    NmVmNmQ3NDVmNWMzMzIyNjhjN2QwZGI2ZjJiN2Y0NDgyMjQxNzQ0MjFmN2Rm
-    OWUwMjhhMWEyZmNmMTIzODNkYzdkNDkwYjRkY2M1NjRkNDBkNWI=
+    ZGM2OWU1ZGZlYmEyZTVlODMyYzJiZDU5ZDliMWI0ZjExNWMwYzFmODU5NmNl
+    ZDRlYjY5NzEzMjA5NmI0NTQwMmE0MjBiNDBkNTc2NDQ2ZGIxZTVkNDhhNzA2
+    MDFiNWMxMjhhOTA2YzUyYzMxN2ZhMzk1YjZlYmIzYjdkZDk2ZjM=
   data.tar.gz: !binary |-
-    NTE0ODQwZWI0NTgxYjk1MGU5ZGQyMGI3ZWQxOGM2ZGI5OGMxOTUxNjA1ZGM2
-    N2U5ZTRiNTQwZmVhM2M0OTg3ZDUwNjI5MGFiNTYwNTlkNmEyNmZmMjQxM2Nk
-    YzVjNDA5MjBlYzM3MWQ4ZGIyOGQ0NGY0OTJiNGM5ZWRkOGFjMDg=
+    Zjc3ZmVkY2QzNWZjZDUxYWNiYWQ5MWRhYjlkNjM2ZTg1Nzc0MDBhNWNlZWY4
+    ZDUzYjg1YWJiZDUxYzlkN2E0ZDg1NTk5YzMwMzdiMzRkMGZhNDdhOTMyMWUw
+    ZDE0YTVmNTBkZWI1MmNjNGEyNjgyOWI1YWQyYTRkNjgzNTFhZWY=

data/lib/steno/sink/eventlog.rb

@@ -9,13 +9,13 @@ if Steno::Sink::WINDOWS
     include Singleton
 
     LOG_LEVEL_MAP = {
-        :fatal => Win32::EventLog::ERROR,
-        :error => Win32::EventLog::ERROR,
-        :warn => Win32::EventLog::WARN,
-        :info => Win32::EventLog::INFO,
-        :debug => Win32::EventLog::INFO,
-        :debug1 => Win32::EventLog::INFO,
-        :debug2 => Win32::EventLog::INFO,
+        :fatal => Win32::EventLog::ERROR_TYPE,
+        :error => Win32::EventLog::ERROR_TYPE,
+        :warn => Win32::EventLog::WARN_TYPE,
+        :info => Win32::EventLog::INFO_TYPE,
+        :debug => Win32::EventLog::INFO_TYPE,
+        :debug1 => Win32::EventLog::INFO_TYPE,
+        :debug2 => Win32::EventLog::INFO_TYPE,
     }
 
     def initialize

data/lib/steno/sink/syslog.rb

@@ -9,6 +9,7 @@ unless Steno::Sink::WINDOWS
     include Singleton
 
     MAX_MESSAGE_SIZE = 1024 * 3
+    TRUNCATE_POSTFIX = "..."
 
     LOG_LEVEL_MAP = {
         :fatal  => Syslog::LOG_CRIT,
@@ -48,8 +49,8 @@ unless Steno::Sink::WINDOWS
     def truncate_record(record)
       return record if record.message.size <= MAX_MESSAGE_SIZE
 
-      truncated = record.message.slice(0..(MAX_MESSAGE_SIZE - 1))
-      truncated << "..."
+      truncated = record.message.slice(0...(MAX_MESSAGE_SIZE - TRUNCATE_POSTFIX.size))
+      truncated << TRUNCATE_POSTFIX
       Steno::Record.new(record.source, record.log_level,
                         truncated,
                         [record.file, record.lineno, record.method],

data/lib/steno/version.rb

@@ -1,3 +1,3 @@
 module Steno
-  VERSION = "1.2.2"
+  VERSION = "1.2.4"
 end

data/spec/unit/sink/eventlog_spec.rb

@@ -25,7 +25,7 @@ if Steno::Sink::WINDOWS
         sink.codec = codec
 
         eventlog.should_receive(:report_event).with(:source      => "CloudFoundry",
-                                                    :event_type  => Win32::EventLog::INFO,
+                                                    :event_type  => Win32::EventLog::INFO_TYPE,
                                                     :data        => record.message)
 
         sink.add_record(record)

data/spec/unit/sink/syslog_spec.rb

@@ -47,12 +47,13 @@ unless Steno::Sink::WINDOWS
         sink.open(identity)
 
         truncated = record_with_big_message.message.
-            slice(0..(Steno::Sink::Syslog::MAX_MESSAGE_SIZE) - 1)
-        truncated << "..."
+            slice(0..(Steno::Sink::Syslog::MAX_MESSAGE_SIZE) - 4)
+        truncated << Steno::Sink::Syslog::TRUNCATE_POSTFIX
         codec = double("codec")
         codec.should_receive(:encode_record) do |*args|
           args.size.should == 1
           args[0].message.should == truncated
+          args[0].message.size.should <= Steno::Sink::Syslog::MAX_MESSAGE_SIZE
 
           next args[0].message
         end

data/steno.gemspec

@@ -25,7 +25,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
   gem.version       = Steno::VERSION
 
-  gem.add_dependency("grape")
   gem.add_dependency("yajl-ruby", "~> 1.0")
   gem.add_dependency("fluent-logger")
   
@@ -36,6 +35,6 @@ Gem::Specification.new do |gem|
   
   if RUBY_PLATFORM=~ /mswin|mingw|cygwin/
     gem.platform      = Gem::Platform::CURRENT
-    gem.add_dependency("win32-eventlog")
+    gem.add_dependency("win32-eventlog", "~> 0.6.0")
   end
 end

metadata

@@ -1,29 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: steno
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.4
 platform: ruby
 authors:
 - mpage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-06 00:00:00.000000000 Z
+date: 2014-02-17 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: grape
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -116,32 +102,31 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- README.md
+- Rakefile
 - bin/steno-prettify
+- lib/steno.rb
+- lib/steno/codec.rb
 - 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.rb
 - lib/steno/sink/base.rb
 - lib/steno/sink/counter.rb
 - lib/steno/sink/eventlog.rb
 - lib/steno/sink/fluentd.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
@@ -149,7 +134,6 @@ files:
 - spec/unit/config_spec.rb
 - spec/unit/context_spec.rb
 - spec/unit/core_ext_spec.rb
-- spec/unit/http_handler_spec.rb
 - spec/unit/json_codec_spec.rb
 - spec/unit/json_prettifier_spec.rb
 - spec/unit/log_level_spec.rb
@@ -182,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.7
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A logging library.
@@ -194,7 +178,6 @@ test_files:
 - spec/unit/config_spec.rb
 - spec/unit/context_spec.rb
 - spec/unit/core_ext_spec.rb
-- spec/unit/http_handler_spec.rb
 - spec/unit/json_codec_spec.rb
 - spec/unit/json_prettifier_spec.rb
 - spec/unit/log_level_spec.rb

data/lib/steno/http_handler.rb

@@ -1,41 +0,0 @@
-require "steno"
-
-require "grape"
-
-module Steno
-end
-
-class Steno::HttpHandler < Grape::API
-  format :json
-
-  resource :loggers do
-    get :levels do
-      Steno.logger_level_snapshot
-    end
-
-    put :levels do
-      missing = [:regexp, :level].select { |p| !params.key?(p) }.map(&:to_s)
-
-      if !missing.empty?
-        error!("Missing query parameters: #{missing}", 400)
-      end
-
-      regexp = nil
-      begin
-        regexp = Regexp.new(params[:regexp])
-      rescue => e
-        error!("Invalid regexp", 400)
-      end
-
-      level = params[:level].to_sym
-      if !Steno::Logger::LEVELS.key?(level)
-        levels = Steno::Logger::LEVELS.keys.map(&:to_s)
-        error!("Unknown level: #{level}. Supported levels are: #{levels}", 400)
-      end
-
-      Steno.set_logger_regexp(regexp, level)
-
-      "ok"
-    end
-  end
-end

data/spec/unit/http_handler_spec.rb

@@ -1,73 +0,0 @@
-require "spec_helper"
-
-require "steno/http_handler"
-
-describe Steno::HttpHandler do
-  include Rack::Test::Methods
-
-  let(:config) { Steno::Config.new }
-
-  before :each do
-    Steno.init(config)
-  end
-
-  def app
-    Steno::HttpHandler
-  end
-
-  describe "GET /loggers/levels" do
-    it "returns a hash of logger name to level" do
-      get "/loggers/levels"
-      json_body.should == {}
-
-      foo = Steno.logger("foo")
-      foo.level = :debug
-
-      bar = Steno.logger("bar")
-      bar.level = :info
-
-      get "/loggers/levels"
-      json_body.should == { "foo" => "debug", "bar" => "info" }
-    end
-  end
-
-  describe "PUT /loggers/levels" do
-    it "returns an error on missing parameters" do
-      put "/loggers/levels"
-      last_response.status.should == 400
-      json_body["error"].should match(/Missing query parameters/)
-
-      put "/loggers/levels", :regexp => "hi"
-      last_response.status.should == 400
-      json_body["error"].should match(/Missing query parameters/)
-
-      put "/loggers/levels", :level => "debug"
-      last_response.status.should == 400
-      json_body["error"].should match(/Missing query parameters/)
-    end
-
-    it "returns an error on invalid log levels" do
-      put "/loggers/levels", :regexp => "hi", :level => "foobar"
-      last_response.status.should == 400
-      json_body["error"].should match(/Unknown level/)
-    end
-
-    it "updates log levels for loggers whose name matches the regexp" do
-      foo = Steno.logger("foo")
-      foo.level = :debug
-
-      bar = Steno.logger("bar")
-      bar.level = :warn
-
-      put "/loggers/levels", :regexp => "f", :level => "error"
-      last_response.status.should == 200
-
-      foo.level.should == :error
-      bar.level.should == :warn
-    end
-  end
-
-  def json_body
-    Yajl::Parser.parse(last_response.body)
-  end
-end