uu 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 73d99f426e2be9be3bdf189a6462aca5c00d0465eb44c721679024d3e7e722f7
-  data.tar.gz: f9213a72553bcc9e27e97e0e5e7816d0c3fc0581626b4db5be4ffa5989a7d6b1
+  metadata.gz: 8b7321eb0a2d0928bc20c2ee316c730243f3cb10b1fe4eda29d18d4d6507a81a
+  data.tar.gz: cedd60c4e5b0606e31e7f2aec8fe6db9dd426f00cf2c8d8e768d52a6268e0d58
 SHA512:
-  metadata.gz: 4528a5cf71ccd0d87b4e6aa2e50b58f41cf297ab94dd801c10ac101b91d5f843fa095d40dcecc0bc8f927c759f40ca932f174da6cdd6d6bf366825624836405c
-  data.tar.gz: 014d2f831489df7e18fe726f58bc680976f78cac8dfc4c55bab1d652bc24ec0c577ad5b324c7a7794810b395d64b9a8403f5ef8c9cb299c3c4a7b3a29131ff03
+  metadata.gz: 99a5ff6fc748b2f6632f76f987f53130127c427a81ad1ff4d92fbede3fb989703e6e19d15cfcdb3391455cf5a27b8d8be9fd4c7c4b1fe2a1778200175e310ce8
+  data.tar.gz: 2a48f11663da10487d6be1cc117dbb09add2325a5056c169684dc4d0fdaf6011ab1eb7cb2507dcaf07d00d822224e88805da8dc612f2d6fa3a4941ae95fb4796

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    uu (0.2.0)
+    uu (0.2.1)
       colorize
       fluent-logger
 

data/lib/uu/log.rb

@@ -2,8 +2,8 @@
 
 module UU
   class Log
-    include LogContext
     include Loggable
+    include LogContext
 
     def self.instance
       Thread.current[:logger] ||= new

data/lib/uu/log_context.rb

@@ -10,6 +10,10 @@ module UU
       @context ||= {}
     end
 
+    def append_context(context_)
+      self.context = context.merge(context_)
+    end
+
     def with(context_)
       original_context = context
       self.context = context.merge(context_)

data/lib/uu/loggable.rb

@@ -13,5 +13,7 @@ module UU
     def_delegators \
       :'::UU::Log.instance', \
       :debug, :info, :warn, :error, :fatal, :with
+
+    def_delegators :'::UU::LoggerFluent::Formatter', :tag, :tag=
   end
 end

data/lib/uu/logger_fluent.rb

@@ -5,19 +5,24 @@ require 'fluent-logger'
 module UU
   class LoggerFluent
     class Formatter
-      def initialize(context, tag)
+      DEFAULT_TAG = 'fluentd'
+      @tag = ENV['FLUENTD_TAG'] || DEFAULT_TAG
+      class << self
+        attr_accessor :tag
+      end
+
+      def initialize(context)
         @context = context
-        @tag = tag
       end
 
       attr_reader :context
 
       def call(severity, msg)
-        [@tag, {
+        [self.class.tag, {
           log_level: severity,
           **metadata,
-          message: msg,
           **@context.context,
+          **(msg.is_a?(Hash) ? msg : { message: msg }),
         }]
       end
 
@@ -51,29 +56,19 @@ module UU
 
     NIL = Nil.new
 
-    @cached_logger = Hash.new do |hash, key|
-      hash[key] =
-        Fluent::Logger::FluentLogger.new(
-          nil,
-          nanosecond_precision: true,
-          **key,
-        )
+    def initialize(cxt, host: ENV['FLUENTD_HOST'], port: ENV['FLUENTD_PORT'])
+      @logger = create_logger(host, port)
+      @formatter = Formatter.new(cxt)
     end
 
-    class << self
-      attr_reader :cached_logger
-    end
+    def create_logger(host, port)
+      return NIL unless host
 
-    def initialize(cxt, host: ENV['FLUENTD_HOST'], port: ENV['FLUENTD_PORT'])
-      @logger =
-        if host
-          self.class.cached_logger[
-            { host: host, **(port ? { port: port.to_i } : {}) }
-          ]
-        else
-          NIL
-        end
-      @formatter = Formatter.new(cxt, 'tag')
+      Fluent::Logger::FluentLogger.new(
+        nil,
+        nanosecond_precision: true,
+        host: host, **(port ? { port: port.to_i } : {})
+      )
     end
 
     attr_reader :logger

data/lib/uu/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module UU
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uu
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Minwoo Lee
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-16 00:00:00.000000000 Z
+date: 2019-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize