logfoo 0.0.15 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7598ba2df8e78ef3ee119a5d97a3cd0c98826db
-  data.tar.gz: d7c3785a015a5b1c2922be6df4b35c3ecc4b5586
+  metadata.gz: 857999027a1fcc041e9d18a8e21a553c341e8fa5
+  data.tar.gz: 26405011efeb66f671e034123ec21919623b7f99
 SHA512:
-  metadata.gz: e48012c7d9ec1ebad5199544508a747e45f625c9ae63b82cd3ad97fc9c6c465a991d6e7b1cc69169bb0fa755e3926f4c11a883b582019b137bf8928ce7d77ee0
-  data.tar.gz: f27d853c96d28634a12c7d25938ad280c9414e6ef770128503b0e9312dc9ebcb98d5cadf682142b1542f03669376e43ae0207437bbb16574cf364e1e6b4a502d
+  metadata.gz: 0cd7eca7fad685d5867b8a0ecf9e6d91522c4f449f4cf714b0cb77c32d460337492527bdef3fe2a4ddd179c865948e9edaf5e721bdfa7b70cc6e8e897b985b04
+  data.tar.gz: 5ff3c3bee068a5d2cba43ef602f98fdc09c5b45e481bd434f8d9e54d4c045e97043b59c8ec784eeef19f6bc82522b914a7f931b6d3632ccf3d0b2dc914ba7a36

data/lib/logfoo/context.rb

@@ -1,12 +1,13 @@
 module Logfoo
   class Context
 
-    attr_reader :level, :scope, :thread_id
+    attr_reader :level, :name, :thread_id
 
-    def initialize(app, scope, context = nil)
+    THREAD_CONTEXT = :"logfoo_context"
+
+    def initialize(app, name, context = nil)
       @app          = app
-      @scope        = scope
-      @thread_id    = :"logfoo_context_#{scope}"
+      @name         = name
       @level        = Logfoo::DEBUG
       @context      = context || {}
     end
@@ -27,17 +28,17 @@ module Logfoo
       if block_given?
         keys ||= {}
         begin
-          Thread.current[thread_id] ||= []
-          Thread.current[thread_id].push(keys)
+          Thread.current[THREAD_CONTEXT] ||= []
+          Thread.current[THREAD_CONTEXT].push(keys)
           yield
         ensure
-          Thread.current[thread_id].pop
-          if Thread.current[thread_id] == []
-            Thread.current[thread_id] = nil
+          Thread.current[THREAD_CONTEXT].pop
+          if Thread.current[THREAD_CONTEXT] == []
+            Thread.current[THREAD_CONTEXT] = nil
           end
         end
       else
-        keys = (Thread.current[thread_id] || []).inject({}) do |memo, kvs|
+        keys = (Thread.current[THREAD_CONTEXT] || []).inject({}) do |memo, kvs|
           kvs.each do |(k,v)|
             memo.merge!(k => v)
           end
@@ -73,12 +74,12 @@ module Logfoo
 
           entry =
             if message.is_a?(Exception)
-              ExceptionEntry.build(@scope, message, payload, level: level_id)
+              ExceptionEntry.build(@name, message, payload, level: level_id)
             else
               Entry.new(
                 level_id,
                 Time.now,
-                @scope,
+                @name,
                 message,
                 payload,
                 Thread.current.object_id

data/lib/logfoo/entry.rb

@@ -1,11 +1,11 @@
 module Logfoo
-  Entry = Struct.new(:level, :time, :scope, :message, :payload, :thread) do
+  Entry = Struct.new(:level, :time, :logger_name, :message, :payload, :thread) do
     def to_h
       {
         level:   level   || :info,
         time:    time    || Time.now,
         msg:     message,
-        scope:   scope,
+        logger:  logger_name,
       }.merge!(
         payload || {}
       ).merge!(
@@ -14,13 +14,13 @@ module Logfoo
     end
   end
 
-  ExceptionEntry = Struct.new(:level, :time, :scope, :exception, :payload, :thread) do
+  ExceptionEntry = Struct.new(:level, :time, :logger_name, :exception, :payload, :thread) do
     class << self
-      def build(scope, ex, payload = nil, options = {})
+      def build(logger_name, ex, payload = nil, options = {})
         self.new(
           options[:level],
           Time.now,
-          scope,
+          logger_name,
           ex,
           payload,
           Thread.current.object_id
@@ -30,16 +30,16 @@ module Logfoo
 
     def to_h
       {
-        level:     level || :error,
-        time:      time  || Time.now,
-        msg:       exception.message,
-        scope:     scope,
-        exception: exception.class.to_s,
+        level:  level || :error,
+        time:   time  || Time.now,
+        msg:    exception.message,
+        logger: logger_name,
+        err:    exception.class.to_s,
       }.merge!(
         payload || {}
       ).merge!(
-        thread:    thread,
-        backtrace: exception.backtrace,
+        thread:     thread,
+        stacktrace: exception.backtrace,
       )
     end
   end

data/lib/logfoo/formatters/logfmt_formatter.rb

@@ -4,20 +4,25 @@ module Logfoo
   class LogfmtFormatter
 
     UNESCAPED_STRING = /\A[\w\.\-\+\%\,\:\;\/]*\z/i.freeze
+    STACKTRACE_RE    = /^(.+?):(\d+):in `(.+)'$/.freeze
     IGNORED_KEYS     = [:time]
     FLOAT_FORMAT     = '%0.4f'.freeze
 
     def call(entry)
       case entry
       when ExceptionEntry, Entry
-        format_entry(entry)
+        remove_nl format_entry(entry)
       else
-        entry.to_s
+        remove_nl entry.to_s
       end
     end
 
     private
 
+      def remove_nl(s)
+        s.tr("\n", ' ')
+      end
+
       def format_entry(entry)
         "#{format_hash(entry.to_h)}\n"
       end
@@ -32,11 +37,25 @@ module Logfoo
         end.join(" ")
       end
 
+      def format_stacktrace(stack)
+        stack =
+          stack.inject([]) do |ac, line|
+            if line.match(STACKTRACE_RE)
+              ac.push [$1,$2,$3].join(":")
+            end
+            ac
+          end
+        if stack.any?
+          "\"#{stack.join(",")}\""
+        end
+      end
+
       def sanitize(k, v)
         case v
         when ::Array
-          if k == :backtrace
-            quote v.map{|i| i.to_s }.join(",")
+          if k == :stacktrace
+            format_stacktrace(v)
+            #quote v.map{|i| i.to_s }.join(",")
           else
             may_quote v.map{|i| i.to_s }.join(",")
           end

data/lib/logfoo/integrations/rack/err.rb

@@ -37,10 +37,18 @@ module Logfoo::Rack
 
     def append(e, env)
       env   = clean_env(env)
+      env   = prefix_env(env)
       entry = Logfoo::ExceptionEntry.build(LOGGER_NAME, e, env)
       Logfoo::App.instance.append(entry)
     end
 
+    def prefix_env(env)
+      env.inject({}) do |ac, (key, value)|
+        ac.merge!("env.#{key}" => value)
+        ac
+      end
+    end
+
     def clean_env(env)
       env.inject({}) do |ac, (key, value) |
         case

data/lib/logfoo/version.rb

@@ -1,3 +1,3 @@
 module Logfoo
-  VERSION = '0.0.15'
+  VERSION = '0.1.0'
 end

data/lib/logfoo.rb

@@ -12,8 +12,8 @@ module Logfoo
 
   extend self
 
-  def get_logger(scope, context = nil)
-    Context.new(App.instance, scope.to_s, context)
+  def get_logger(name, context = nil)
+    Context.new(App.instance, name.to_s, context)
   end
 
   def stop

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: logfoo
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.1.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler