logfoo 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 090c89addea5e5f294a83fc7118fc5f05eb7fcc2
-  data.tar.gz: e98d25ed50c2f2d443b3493b923924316b485620
+  metadata.gz: d2ab2a6961e98080ef4549bd79f9eeacc33b3ae6
+  data.tar.gz: 6612af471af0fd75cc61fc39f77d26c29ff354f6
 SHA512:
-  metadata.gz: b25cfaf625776d1424efdb87e0da631657633bd56d228dac97648b3466498bebff63cb8e1b26e6b3e2d89fc7119ba14df08444ebc66b6bdb55745fddb0958e3f
-  data.tar.gz: 2eb571f9dc9be891d7aaaaf972f4a2e5447c457a5c1787c0ca8989a196df17a5ef2c71789196d1930a56596e68758c30f606a3a9bbdb25b6c87a714462825d33
+  metadata.gz: 9a69c4988db2c8ad3865bb68da9689f1387df38c781e2edcaafb182f71aa18b2bcb4aefc33a62baf0c63a60040a7c14f7c2b859cc6e068b98d04fb6704443231
+  data.tar.gz: d0e105c5aba05d840e4b227cab173f6446f5f2e0d637adfe307c9dc8d071b64a1bdf5db45568c8a13d26680c79fd9574b269c49e37fe1b1256896d7f949a32bb

data/lib/logfoo.rb

@@ -30,7 +30,6 @@ end
   formatters/logfmt_formatter
   formatters/simple_formatter
   appenders/io_appender
-  exception_handlers/stderr_exception_handler
   measure
   app
   context

data/lib/logfoo/app.rb

@@ -52,43 +52,31 @@ module Logfoo
               break
             when :boom
               raise IGNORE_ME_ERROR
-            when ErrLine
-              App._handle_exception(line)
             else
               App._append(line)
             end
           end
         rescue Exception => ex
           line = ErrLine.build(logger_name: self.class, exception: ex)
-          App._handle_exception(line)
+          App._append(line)
           retry
         end
       end ; end
   end
 
   class App ; class << self
-    @@appenders          = []
-    @@exception_handlers = []
+    @@appenders = []
 
     def appenders(*fn)
       @@appenders = fn.flatten
     end
 
-    def exception_handlers(*fn)
-      @@exception_handlers = fn.flatten
-    end
-
-    def _handle_exception(entry)
-      @@exception_handlers.each{|fn| fn.call(entry) }
-    end
-
     def _append(entry)
       @@appenders.each{|fn| fn.call(entry) }
     end
 
     def _reset!
       appenders IoAppender.new
-      exception_handlers StderrExceptionHanlder.new
     end
   end ; end
 

data/lib/logfoo/appenders/io_appender.rb

@@ -1,21 +1,41 @@
 module Logfoo ; class IoAppender
-  def initialize(io = nil, formatter = nil)
-    @io        = io || STDOUT
 
-    if @io.respond_to?(:sync=)
-      @io.sync = true
-    end
+  def initialize(out: nil, err: nil, formatter: nil)
+    @stdout    = out || STDOUT
+    @stderr    = err || STDERR
+    @formatter = formatter || (tty? ? SimpleFormatter.new : LogfmtFormatter.new)
 
-    is_tty     = @io.respond_to?(:tty?) && @io.tty?
-    @formatter = formatter || (is_tty ? SimpleFormatter.new : LogfmtFormatter.new)
+    sync!
   end
 
   def call(entry)
-    write @formatter.call(entry)
+    io =
+      case entry
+      when ErrLine
+        @stderr
+      else
+        @stdout
+      end
+
+    io.write @formatter.call(entry)
+    io.flush
   end
 
-  def write(body)
-    @io.write body
-    @io.flush
+  def tty?
+    [@stdout, @stderr].inject(true) do |memo, io|
+      if memo
+        memo = io.respond_to?(:tty?) && io.tty?
+      end
+      memo
+    end
   end
+
+  def sync!
+    [@stdout, @stderr].each do |io|
+      if io.respond_to?(:sync=)
+        io.sync = true
+      end
+    end
+  end
+
 end ; end

data/lib/logfoo/formatters/logfmt_formatter.rb

@@ -12,7 +12,7 @@ module Logfoo ; class LogfmtFormatter
     when ErrLine, LogLine
       format_line(line)
     else
-      "#{remove_nl entry.to_s}\n"
+      "#{remove_nl line.to_s}\n"
     end
   end
 

data/lib/logfoo/version.rb

@@ -1,3 +1,3 @@
 module Logfoo
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logfoo
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -100,7 +100,6 @@ files:
 - lib/logfoo/appenders/io_appender.rb
 - lib/logfoo/context.rb
 - lib/logfoo/entries.rb
-- lib/logfoo/exception_handlers/stderr_exception_handler.rb
 - lib/logfoo/formatters/logfmt_formatter.rb
 - lib/logfoo/formatters/simple_formatter.rb
 - lib/logfoo/integrations/hutch.rb

data/lib/logfoo/exception_handlers/stderr_exception_handler.rb

@@ -1,9 +0,0 @@
-module Logfoo ; class StderrExceptionHanlder
-  def initialize(appender = nil)
-    @appender = appender || IoAppender.new(STDERR)
-  end
-
-  def call(entry)
-    @appender.call entry
-  end
-end ; end