vx-lib-logger 0.0.8 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8c3f397ec443db13af556a19b2983f6230ce15c
-  data.tar.gz: e0e7851762093a6f7638ceeb259c6e48de3c2e93
+  metadata.gz: 8f98e748e5656d369a8c12d57f0ad8c358060c06
+  data.tar.gz: 83b4d6156cb3ec83c2a2f8dd23fcc61f6eb51933
 SHA512:
-  metadata.gz: c46b25e44b4bb056223f074c7e2d7d185e3d7c7a107da67f961dfac558d59bcf4c82cd1b1d8d56c7d25636122e33f5fb719e4d9c7f92a9d4932fe350dbda8b99
-  data.tar.gz: d21d20132e2fcf000bccee39653190e7fa3b17e7dfc9e9b17bfb9ac8cf54fb95b63cd0a1669362f03f3df5c6ee46417ade20426e3805138332c619d96dd32ee8
+  metadata.gz: fad51d812538094eeafa610b05046d6536ce76fcc0da99864237cfdcf4d5a3cdb1ca850215239e0ed947a76b63136fe1ea4d670f262669e4d6f40470ae28aaf6
+  data.tar.gz: 4954cf928b9d44e2fa3035ba4a1b38c3f7f03fa8964e8c08889bedff7071e2dd33d7e9492de60062467516260d702981dfa9365ccd9ccd615d1732ca6665158b

data/Rakefile

@@ -1,2 +1,10 @@
 require "bundler/gem_tasks"
 
+require 'rake/testtask'
+
+task :spec do
+  $LOAD_PATH.unshift(File.expand_path("../spec", __FILE__))
+  Dir.glob('./spec/lib/*_spec.rb').each { |file| require file}
+end
+
+task default: :spec

data/lib/vx/lib/logger.rb

@@ -6,12 +6,15 @@ module Vx ; module Lib
 
     autoload :Instance,         File.expand_path("../logger/instance",          __FILE__)
     autoload :JsonFormatter,    File.expand_path("../logger/json_formatter",    __FILE__)
-    autoload :Instrumentations, File.expand_path("../logger/instrumentations",  __FILE__)
-    autoload :HandleExceptions, File.expand_path("../logger/handle_exceptions", __FILE__)
+    autoload :RawFormatter,     File.expand_path("../logger/raw_formatter",     __FILE__)
+
+    module Rack
+      autoload :HandleExceptions, File.expand_path("../logger/rack/handle_exceptions", __FILE__)
+    end
 
     @@default = Instance.new(STDOUT)
 
-    def self.get(io, options)
+    def self.get(io = nil, options = {})
       Instance.new(io, options)
     end
 

data/lib/vx/lib/logger/instance.rb

@@ -10,10 +10,10 @@ module Vx ; module Lib ; module Logger
     def initialize(io, params = {})
       @params           = params
       @logger           = ::Logger.new(io, 7, 50_000_000)
-      @logger.formatter = get_formatter(params[:format])
+      @logger.formatter = RawFormatter.new
     end
 
-    [:fatal, :warn, :debug, :error, :info, :notice].each do |m|
+    [:fatal, :warn, :debug, :error, :info].each do |m|
       define_method m do |*args|
         process_message(m, *args)
       end
@@ -81,11 +81,8 @@ module Vx ; module Lib ; module Logger
         end
 
         body = {
-          message:    message.to_s,
           thread_id:  ::Thread.current.object_id,
           process_id: ::Process.pid,
-          progname:   (params[:progname] || :ruby),
-          level:      level,
         }
 
         if options && options != {}
@@ -94,7 +91,11 @@ module Vx ; module Lib ; module Logger
           )
         end
 
-        @logger.public_send level, body
+        @logger.public_send level, format_message(message, body)
+      end
+
+      def format_message(message, payload)
+        JsonFormatter.call(message, payload)
       end
 
   end

data/lib/vx/lib/logger/json_formatter.rb

@@ -2,48 +2,13 @@ require 'oj'
 
 module Vx ; module Lib ; module Logger
 
-  JsonFormatter = Struct.new(:parent) do
+  module JsonFormatter
 
-    def call(_, _, _, msg)
-      ::Oj.dump(msg, mode: :compat) + "\n"
+    def self.call(message, payload)
+      payload = ::Oj.dump(payload, mode: :compat)
+      "#{message} :--: #{payload}"
     end
 
-=begin
-    def safe_value(value, options = {})
-      new_value = case value.class.to_s
-                  when "String", "Fixnum", "Float"
-                    value
-                  when "Symbol", "BigDecimal"
-                    value.to_s
-                  when "Array"
-                    value = value.map(&:to_s)
-                    options[:join_arrays] ? value.join("\n") : value
-                  when 'NilClass'
-                    nil
-                  else
-                    value.inspect
-                  end
-      if new_value.is_a?(String)
-        new_value.encode('UTF-8', {:invalid => :replace, :undef => :replace, :replace => '?'})
-      else
-        new_value
-      end
-    end
-
-    def make_safe_hash(msg, options = {})
-      msg.inject({}) do |acc, pair|
-        msg_key, msg_value = pair
-
-        if msg_key == :fields
-          acc[msg_key] = make_safe_hash(msg_value, join_arrays: true)
-        else
-          acc[msg_key] = safe_value(msg_value, options)
-        end
-        acc
-      end
-    end
-  end
-=end
   end
 
 end ; end ; end

data/lib/vx/lib/logger/raw_formatter.rb

@@ -0,0 +1,10 @@
+module Vx ; module Lib ; module Logger
+
+  RawFormatter = Struct.new(:parent) do
+
+    def call(severity, datetime, progname, msg)
+      "[#{severity}] #{msg.to_s}\n"
+    end
+  end
+
+end ; end ; end

data/lib/vx/lib/logger/version.rb

@@ -1,7 +1,7 @@
 module Vx
   module Lib
     module Logger
-      VERSION = "0.0.8"
+      VERSION = "0.1.0"
     end
   end
 end

data/spec/lib/instance_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+
+require 'stringio'
+
+describe Vx::Lib::Logger::Instance do
+
+   before do
+     @out = StringIO.new
+     @log = Vx::Lib::Logger.get(@out)
+     assert @log
+   end
+
+   [:fatal, :warn, :debug, :error, :info].each do |m|
+     it "should write #{m} message" do
+       @log.public_send(m, "send #{m}")
+       text = "[#{m.upcase}] send #{m} :--: {\"thread_id\":#{tid},\"process_id\":#{pid}}\n"
+       assert_equal get_out, text
+     end
+   end
+
+   it "should write message with params" do
+     @log.info "text message", param: :value
+     text = "[INFO] text message :--: {\"thread_id\":#{tid},\"process_id\":#{pid},\"fields\":{\"param\":\"value\"}}\n"
+     assert_equal get_out, text
+   end
+
+   it "should write message with object in params" do
+     @log.info "text message", param: self
+     assert get_out
+   end
+
+   it "should write message with exception in params" do
+     @log.info "text message", exception: Exception.new("got!")
+     text = "[INFO] text message :--: {\"thread_id\":#{tid},\"process_id\":#{pid},\"fields\":{\"exception\":[\"Exception\",\"got!\"],\"backtrace\":\"\"}}\n"
+     assert_equal get_out, text
+   end
+
+   it "should handle block" do
+     @log.handle "text message" do
+       sleep 0.1
+     end
+     assert_match(/duration/, get_out)
+
+     begin
+       @log.handle "text message", key: :value do
+         raise 'got!'
+       end
+     rescue Exception
+     end
+
+     body = get_out
+     assert_match(/duration/, body)
+     assert_match(/key/, body)
+     assert_match(/value/, body)
+     assert_match(/got\!/, body)
+     assert_match(/backtrace/, body)
+   end
+
+   it "should dump invalid unicode key" do
+     @log.info "Le Caf\xc3\xa9 \xa9", key: "Le Caf\xc3\xa9 \xa9"
+     text = "[INFO] Le Café \xA9 :--: {\"thread_id\":#{tid},\"process_id\":#{pid},\"fields\":{\"key\":\"Le Café \xA9\"}}\n"
+     assert_equal get_out, text
+   end
+
+   def get_out
+     @out.rewind
+     body = @out.read
+     @out.rewind
+     body
+   end
+
+   def tid
+     Thread.current.object_id
+   end
+
+   def pid
+     Process.pid
+   end
+
+end

data/spec/lib/logger_spec.rb

@@ -0,0 +1,14 @@
+require 'spec_helper'
+
+describe Vx::Lib::Logger do
+  it "should get a new instance" do
+    inst = Vx::Lib::Logger.get
+    assert inst
+  end
+
+  it "should get default instance" do
+    inst = Vx::Lib::Logger.default
+    assert inst
+  end
+
+end

data/spec/lib/rack_handle_exceptions_spec.rb

@@ -0,0 +1,19 @@
+require 'spec_helper'
+
+describe Vx::Lib::Logger::Rack::HandleExceptions do
+
+  it "should run successfuly" do
+    app    = ->(env) { env }
+    handle = Vx::Lib::Logger::Rack::HandleExceptions.new(app)
+    re = handle.call('env')
+    assert_equal re, 'env'
+  end
+
+  it "should run with exception" do
+    app    = ->(env) { raise 'got!' }
+    handle = Vx::Lib::Logger::Rack::HandleExceptions.new(app)
+    re = handle.call({})
+    assert_equal re, 'env'
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+require File.expand_path("../../lib/vx/lib/logger", __FILE__)
+
+require 'minitest/spec'
+require 'minitest/autorun'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vx-lib-logger
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-16 00:00:00.000000000 Z
+date: 2015-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: oj
@@ -65,11 +65,15 @@ files:
 - README.md
 - Rakefile
 - lib/vx/lib/logger.rb
-- lib/vx/lib/logger/handle_exceptions.rb
 - lib/vx/lib/logger/instance.rb
-- lib/vx/lib/logger/instrumentations.rb
 - lib/vx/lib/logger/json_formatter.rb
+- lib/vx/lib/logger/rack/handle_exceptions.rb
+- lib/vx/lib/logger/raw_formatter.rb
 - lib/vx/lib/logger/version.rb
+- spec/lib/instance_spec.rb
+- spec/lib/logger_spec.rb
+- spec/lib/rack_handle_exceptions_spec.rb
+- spec/spec_helper.rb
 - vx-lib-logger.gemspec
 homepage: ''
 licenses:
@@ -95,4 +99,8 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: summary
-test_files: []
+test_files:
+- spec/lib/instance_spec.rb
+- spec/lib/logger_spec.rb
+- spec/lib/rack_handle_exceptions_spec.rb
+- spec/spec_helper.rb

data/lib/vx/lib/logger/instrumentations.rb

@@ -1,25 +0,0 @@
-require 'active_support'
-
-module Vx ; module Lib ; module Logger
-  class Instrumentations
-
-    class << self
-
-      def activate
-        ActiveSupport::Notifications.subscribe(/.*/) do |event, started, finished, _, payload|
-          case event
-          when /\.action_controller$/
-            process_action_controller(event, started, finished, payload)
-          end
-        end
-      end
-
-      private
-
-        def process_action_controller(event, started, finished, payload)
-        end
-
-    end
-
-  end
-end ; end ; end