logfoo 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c5eb9f2b571c4163b6877c14134fcbd0a30608b
-  data.tar.gz: bac45eec0c78cd8802217a0a0ccc734ef0199f5f
+  metadata.gz: 3f635ccd0588d2b30983b1dcf0c5037d62da8239
+  data.tar.gz: d44dcf8fe0b1c0128f987836c10595c206c6b0d8
 SHA512:
-  metadata.gz: 8c66be1494b10897ac1d3d5bf90c061aa24c9863a7189619cf4acd722c2f4e961a2ef2822653c8d1428e9aa27d8c281635ece8bba9df84189fd1c403f09c670f
-  data.tar.gz: fdaa2e7761e43749acf3923fabe28eb2a11e24fbf06b6d38039325d71fedc093326f50dcfbedb220200dfedcda1d5378df55a5e55fb5d28155c8a9f20594e392
+  metadata.gz: 42cc09fff3d3eeb0d1f354da3311c3a31d2fbb6f9a80a778aec2b94aefec3ffd8a6bddf5364636f3ab60790b78062be5590f811c2da65f35e8bc19a00c8f5bf1
+  data.tar.gz: c4b91ae535f8df589a8fb461bee61ab30578e3aa07094dd23150af208edf2920422ee25d9eb316c8c345c7382312b94dfc15b25a830f690155b5bbc176e7a786

data/lib/logfoo/app.rb

@@ -46,14 +46,16 @@ module Logfoo
         begin
           loop do
             entry = @queue.pop
-            if entry == :shutdown
+            case entry
+            when :shutdown
               break
-            end
-            if entry == :boom
+            when :boom
               raise IGNORE_ME_ERROR
+            when ExceptionEntry
+              App._handle_exception(entry)
+            else
+              App._append(entry)
             end
-            App._append(entry)
-            App._handle_exception(entry) if entry.is_a?(ExceptionEntry)
           end
         rescue Exception => ex
           entry = ExceptionEntry.build(self.class, ex)

data/lib/logfoo/appenders/io_appender.rb

@@ -2,6 +2,11 @@ module Logfoo
   class IoAppender
     def initialize(io = nil, formatter = nil)
       @io        = io || STDOUT
+
+      if @io.respond_to?(:sync=)
+        @io.sync = true
+      end
+
       is_tty     = @io.respond_to?(:tty?) && @io.tty?
       @formatter = formatter || (is_tty ? SimpleFormatter.new : LogfmtFormatter.new)
     end

data/lib/logfoo/context.rb

@@ -1,7 +1,7 @@
 module Logfoo
   class Context
 
-    attr_reader :level
+    attr_reader :level, :scope
 
     def initialize(app, scope, context = nil)
       @app     = app

data/lib/logfoo/entry.rb

@@ -34,11 +34,12 @@ module Logfoo
         time:      time  || Time.now,
         msg:       exception.message,
         scope:     scope,
-        err:       exception.class.to_s,
+        exception: exception.class.to_s,
       }.merge!(
         payload || {}
       ).merge!(
-        thread:  thread
+        thread:    thread,
+        backtrace: exception.backtrace,
       )
     end
   end

data/lib/logfoo/exception_handlers/stderr_exception_handler.rb

@@ -1,24 +1,12 @@
 module Logfoo
 
   class StderrExceptionHanlder
-    BACKTRACE_LINE   = "\t%s\n".freeze
-    EXCEPTION_LINE   = "%s: %s\n".freeze
-
     def initialize(appender = nil)
       @appender = appender || IoAppender.new(STDERR)
     end
 
     def call(entry)
-      @appender.write format(entry)
-    end
-
-    def format(entry)
-      values = []
-      values << (EXCEPTION_LINE % [entry.exception.class, entry.exception.message])
-      if entry.exception.backtrace.is_a?(Array)
-        values << entry.exception.backtrace.map{|l| BACKTRACE_LINE % l }.join
-      end
-      values.join
+      @appender.call entry
     end
   end
 

data/lib/logfoo/formatters/logfmt_formatter.rb

@@ -25,17 +25,21 @@ module Logfoo
       def format_hash(attrs)
         attrs.inject([]) do |ac, (k,v)|
           if !IGNORED_KEYS.include?(k) && !(v == nil || v == "")
-            new_value = sanitize(v)
+            new_value = sanitize(k, v)
             ac << "#{k}=#{new_value}"
           end
           ac
         end.join(" ")
       end
 
-      def sanitize(v)
+      def sanitize(k, v)
         case v
         when ::Array
-          may_quote v.map{|i| i.to_s}.join(",")
+          if k == :backtrace
+            "[" + v.map{|i| may_quote i.to_s}.join(",") + "]"
+          else
+            may_quote v.map{|i| i.to_s }.join(",")
+          end
         when ::Integer, ::Symbol
           v.to_s
         when ::Float

data/lib/logfoo/formatters/simple_formatter.rb

@@ -1,10 +1,32 @@
 module Logfoo
   class SimpleFormatter < LogfmtFormatter
 
-    FORMAT = "[%5s]: %s -%s%s".freeze
+    FORMAT           = "[%5s]: %s -%s%s".freeze
+    BACKTRACE_LINE   = "\t%s\n".freeze
+    EXCEPTION_LINE   = "%s: %s\n".freeze
 
     private
 
+      def format_entry(entry)
+        attrs = entry.to_h
+        attrs.delete(:backtrace)
+        str = []
+        str << "#{format_hash(entry.to_h)}\n"
+        if entry.is_a?(ExceptionEntry)
+          str << format_exception(entry)
+        end
+        str.join("")
+      end
+
+      def format_exception(entry)
+        values = []
+        values << (EXCEPTION_LINE % [entry.exception.class, entry.exception.message])
+        if entry.exception.backtrace.is_a?(Array)
+          values << entry.exception.backtrace.map{|l| BACKTRACE_LINE % l }.join
+        end
+        values.join
+      end
+
       def format_hash(attrs)
         level   = attrs.delete(:level)
         message = attrs.delete(:msg)

data/lib/logfoo/mixin.rb

@@ -0,0 +1,16 @@
+module Logfoo
+  module Mixin
+    def self.included(base)
+      base.extend ClassMethods
+      base.log = Logfoo.get_logger(base.name)
+    end
+
+    module ClassMethods
+      attr_accessor :log
+    end
+
+    def log
+      self.class.log
+    end
+  end
+end

data/lib/logfoo/version.rb

@@ -1,3 +1,3 @@
 module Logfoo
-  VERSION = '0.0.9'
+  VERSION = '0.0.10'
 end

data/lib/logfoo.rb

@@ -19,6 +19,10 @@ module Logfoo
   def stop
     App.instance.stop
   end
+
+  def mixin(name: nil)
+    Logfoo::Mixin
+  end
 end
 
 %w{
@@ -29,6 +33,7 @@ end
   exception_handlers/stderr_exception_handler
   app
   context
+  mixin
 }.each do |f|
   require File.expand_path("../logfoo/#{f}", __FILE__)
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: logfoo
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Dmitry Galinsky
@@ -107,6 +107,7 @@ files:
 - lib/logfoo/integrations/rack.rb
 - lib/logfoo/integrations/rack/err.rb
 - lib/logfoo/integrations/rack/log.rb
+- lib/logfoo/mixin.rb
 - lib/logfoo/version.rb
 - logfoo.gemspec
 homepage: https://github.com/dmexe/logfoo