steno 1.2.4 → 1.3.5

data/lib/steno/sink/counter.rb

@@ -1,4 +1,4 @@
-require "steno/sink/base"
+require 'steno/sink/base'
 
 module Steno
   module Sink
@@ -6,7 +6,6 @@ module Steno
 end
 
 class Steno::Sink::Counter < Steno::Sink::Base
-
   def initialize
     # Map of String -> numeric count
     @counts = {}
@@ -17,17 +16,14 @@ class Steno::Sink::Counter < Steno::Sink::Base
     level = record.log_level.to_s
 
     @mutex.synchronize do
-      unless @counts[level]
-        @counts[level] = 0
-      end
+      @counts[level] = 0 unless @counts[level]
       @counts[level] += 1
     end
   end
 
-  def flush
-  end
+  def flush; end
 
-  def to_json
+  def to_json(*_args)
     hash = {}
     @mutex.synchronize do
       Steno::Logger::LEVELS.keys.each do |level_name|

data/lib/steno/sink/eventlog.rb

@@ -1,21 +1,21 @@
 if Steno::Sink::WINDOWS
-  require "steno/sink/base"
+  require 'steno/sink/base'
 
-  require "singleton"
-  require "thread"
+  require 'singleton'
+  require 'thread'
   require 'win32/eventlog'
 
   class Steno::Sink::Eventlog < Steno::Sink::Base
     include Singleton
 
     LOG_LEVEL_MAP = {
-        :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,
+      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
@@ -23,8 +23,8 @@ if Steno::Sink::WINDOWS
       @eventlog = nil
     end
 
-    def open()
-      @eventlog = Win32::EventLog::open('Application')
+    def open
+      @eventlog = Win32::EventLog.open('Application')
     end
 
     def add_record(record)
@@ -32,15 +32,14 @@ if Steno::Sink::WINDOWS
       pri = LOG_LEVEL_MAP[record.log_level]
 
       @eventlog.report_event(
-          :source => 'CloudFoundry',
-          :event_type => pri,
-          :data => msg
+        source: 'CloudFoundry',
+        event_type: pri,
+        data: msg
       )
     end
 
     def flush
       nil
     end
-
   end
-end
+end

data/lib/steno/sink/fluentd.rb

@@ -6,7 +6,6 @@ require 'fluent-logger'
 #   and fluent-logger at https://github.com/fluent/fluent-logger-ruby
 #
 class Steno::Sink::Fluentd < Steno::Sink::Base
-
   # @param [Hash] opts Key :tag_prefix tag prefix of fluent logs (default: steno)
   #                    Key :host fluentd host (default: 127.0.0.1)
   #                    Key :port fluentd port (deafult: 24224)
@@ -14,10 +13,10 @@ class Steno::Sink::Fluentd < Steno::Sink::Base
   def initialize(opts = {})
     super
 
-    @fluentd = Fluent::Logger::FluentLogger.new(opts[:tag_prefix] || "steno",
-      :host => opts[:host] || "127.0.0.1",
-      :port => opts[:port] || 24224,
-      :buffer_limit => opts[:buffer_limit] || Fluent::Logger::FluentLogger::BUFFER_LIMIT)
+    @fluentd = Fluent::Logger::FluentLogger.new(opts[:tag_prefix] || 'steno',
+                                                host: opts[:host] || '127.0.0.1',
+                                                port: opts[:port] || 24_224,
+                                                buffer_limit: opts[:buffer_limit] || Fluent::Logger::FluentLogger::BUFFER_LIMIT)
     @io_lock = Mutex.new
   end
 

data/lib/steno/sink/io.rb

@@ -1,4 +1,4 @@
-require "steno/sink/base"
+require 'steno/sink/base'
 
 module Steno
   module Sink
@@ -16,15 +16,13 @@ class Steno::Sink::IO < Steno::Sink::Base
     # @return [Steno::Sink::IO]
     def for_file(path, opts = {})
       autoflush = true
-      if opts.include?(:autoflush)
-        autoflush = opts[:autoflush]
-      end
+      autoflush = opts[:autoflush] if opts.include?(:autoflush)
 
-      io = File.open(path, "a+")
+      io = File.open(path, 'a+')
 
       io.sync = autoflush
 
-      new(io, :max_retries => opts[:max_retries])
+      new(io, max_retries: opts[:max_retries])
     end
   end
 
@@ -52,12 +50,10 @@ class Steno::Sink::IO < Steno::Sink::Base
       begin
         @io.write(bytes)
       rescue IOError => e
-        if retries < @max_retries
-          retries += 1
-          retry
-        else
-          raise e
-        end
+        raise e unless retries < @max_retries
+
+        retries += 1
+        retry
       end
     end
 

data/lib/steno/sink/syslog.rb

@@ -1,24 +1,24 @@
 unless Steno::Sink::WINDOWS
-  require "steno/sink/base"
+  require 'steno/sink/base'
 
-  require "singleton"
-  require "thread"
-  require "syslog"
+  require 'singleton'
+  require 'thread'
+  require 'syslog/logger'
 
   class Steno::Sink::Syslog < Steno::Sink::Base
     include Singleton
 
     MAX_MESSAGE_SIZE = 1024 * 3
-    TRUNCATE_POSTFIX = "..."
+    TRUNCATE_POSTFIX = '...'
 
     LOG_LEVEL_MAP = {
-        :fatal  => Syslog::LOG_CRIT,
-        :error  => Syslog::LOG_ERR,
-        :warn   => Syslog::LOG_WARNING,
-        :info   => Syslog::LOG_INFO,
-        :debug  => Syslog::LOG_DEBUG,
-        :debug1 => Syslog::LOG_DEBUG,
-        :debug2 => Syslog::LOG_DEBUG,
+      fatal: Syslog::LOG_CRIT,
+      error: Syslog::LOG_ERR,
+      warn: Syslog::LOG_WARNING,
+      info: Syslog::LOG_INFO,
+      debug: Syslog::LOG_DEBUG,
+      debug1: Syslog::LOG_DEBUG,
+      debug2: Syslog::LOG_DEBUG
     }
 
     def initialize
@@ -30,14 +30,18 @@ unless Steno::Sink::WINDOWS
 
     def open(identity)
       @identity = identity
-      @syslog = Syslog.open(@identity, Syslog::LOG_PID, Syslog::LOG_USER)
+
+      Syslog::Logger.new(@identity)
+      @syslog = Syslog::Logger.syslog
     end
 
     def add_record(record)
+      return if record.log_level == :off
+
       record = truncate_record(record)
       msg = @codec.encode_record(record)
       pri = LOG_LEVEL_MAP[record.log_level]
-      @syslog_lock.synchronize { @syslog.log(pri, "%s", msg) }
+      @syslog_lock.synchronize { @syslog.log(pri, '%s', msg) }
     end
 
     def flush
@@ -57,4 +61,4 @@ unless Steno::Sink::WINDOWS
                         record.data)
     end
   end
-end
+end

data/lib/steno/sink.rb

@@ -1,6 +1,6 @@
-require "steno/sink/base"
-require "steno/sink/io"
-require "steno/sink/syslog"
-require "steno/sink/fluentd"
-require "steno/sink/counter"
-require "steno/sink/eventlog"
+require 'steno/sink/base'
+require 'steno/sink/io'
+require 'steno/sink/syslog'
+require 'steno/sink/fluentd'
+require 'steno/sink/counter'
+require 'steno/sink/eventlog'

data/lib/steno/tagged_logger.rb

@@ -1,11 +1,10 @@
-require "steno/logger"
+require 'steno/logger'
 
 module Steno
 end
 
 # Provides a proxy that allows persistent user data
 class Steno::TaggedLogger
-
   attr_reader :proxied_logger
   attr_accessor :user_data
 
@@ -18,7 +17,7 @@ class Steno::TaggedLogger
     end
 
     def define_logf_method(name)
-      define_method(name.to_s + "f") { |fmt, *args| log(name, fmt % args) }
+      define_method(name.to_s + 'f') { |fmt, *args| log(name, fmt % args) }
     end
   end
 

data/lib/steno/version.rb

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

data/lib/steno.rb

@@ -1,21 +1,19 @@
-require "thread"
-
-require "steno/codec"
-require "steno/config"
-require "steno/context"
-require "steno/errors"
-require "steno/log_level"
-require "steno/logger"
-require "steno/tagged_logger"
-require "steno/record"
-require "steno/sink"
-require "steno/version"
+require 'thread'
+
+require 'steno/codec'
+require 'steno/config'
+require 'steno/context'
+require 'steno/errors'
+require 'steno/log_level'
+require 'steno/logger'
+require 'steno/tagged_logger'
+require 'steno/record'
+require 'steno/sink'
+require 'steno/version'
 
 module Steno
   class << self
-
-    attr_reader :config
-    attr_reader :logger_regexp
+    attr_reader :config, :logger_regexp
 
     # Initializes the logging system. This must be called exactly once before
     # attempting to use any Steno class methods.
@@ -48,8 +46,8 @@ module Steno
           level = compute_level(name)
 
           logger = Steno::Logger.new(name, @config.sinks,
-                                     :level => level,
-                                     :context => @config.context)
+                                     level: level,
+                                     context: @config.context)
 
           @loggers[name] = logger
         end
@@ -92,9 +90,7 @@ module Steno
         return if @logger_regexp.nil?
 
         @loggers.each do |name, logger|
-          if name =~ @logger_regexp
-            logger.level = @config.default_log_level
-          end
+          logger.level = @config.default_log_level if name =~ @logger_regexp
         end
 
         @logger_regexp = nil
@@ -104,7 +100,6 @@ module Steno
       nil
     end
 
-
     # @return [Hash] Map of logger name => level
     def logger_level_snapshot
       @loggers_lock.synchronize do

data/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require "rack/test"
-require "rspec"
+require 'rack/test'
+require 'rspec'
 
-require "steno"
+require 'steno'
 
-Dir["./spec/support/**/*.rb"].each { |file| require file }
+Dir['./spec/support/**/*.rb'].each { |file| require file }

data/spec/support/barrier.rb

@@ -1,4 +1,4 @@
-require "thread"
+require 'thread'
 
 class Barrier
   def initialize
@@ -16,7 +16,7 @@ class Barrier
 
   def wait
     @lock.synchronize do
-      @cvar.wait(@lock) if !@done
+      @cvar.wait(@lock) unless @done
     end
   end
 end

data/spec/support/shared_context_specs.rb

@@ -1,7 +1,7 @@
-shared_context :steno_context do
-  it "should support clearing context local data" do
-    context.data["test"] = "value"
+shared_examples 'steno context' do
+  it 'supports clearing context local data' do
+    context.data['test'] = 'value'
     context.clear
-    context.data["test"].should be_nil
+    expect(context.data['test']).to be_nil
   end
 end