log_box 0.0.2 → 0.0.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzcxMmU4NzhkYmJhM2U2OGU4NDZmZmYzMGY3M2I3NmJmOGI0NDc1Yw==
+    M2I1MGRjMzc1NThiOGZkMTc0MTgwYTRiYzdmOWU1NGQ3ZDllNmQzMw==
   data.tar.gz: !binary |-
-    YTZmYTM4YzQzNWExZjdjMjY5OWY3OTA5OWM4ZDBiYmNlMjM1MjZiOQ==
+    YmY5ZTUyZjg4NTY0ZDcxM2UwM2M3YmUwM2QyZGNkNmI4OWEzNTNlZg==
 SHA512:
   metadata.gz: !binary |-
-    YWJmZmM0OGVmYzExMTcxNTFlODdkNmIyNThkY2IzZWEwNWY2NzY1OGUxYmQw
-    MDI4YjZjM2JmOWRiY2JmZDc2ODczOGYyNDhiYjY2MTczNTM2NzYyMTAyMGU2
-    ZjlkYjIwNGUxMDc1YTE3ZTQ0NGU3NTA1ZDFiYzRjMGIzODM4OTE=
+    N2YyZDZlZWE1ZmFjOTc2ZWJlZGEzMWM2MmY5MDczNGMwMjJiMTI2N2ZlMGE0
+    M2UwM2M5NTBkYjUzMWM1YTIyZjg3OWFhMGI2MzBmZjdiNDFkMWYyNmI0NjFl
+    MDYwZDllMGYwYTdjYmIyNGQ2ZDhkYTA4MjFkMmM3NjAxMGJhODc=
   data.tar.gz: !binary |-
-    NzliY2E0NGQ5M2E4YWEwNDllNGYzOWE2YWNkN2E2OTM4MGJmMDlkZGExY2Jj
-    ZWU4MTg3YzdlYjhmN2JiNGY2NGI2ZjEwNDRlMWQ4NjdmODE2MmJiNWI3NjRm
-    NmM3MWRhOGEwMTBmMTFmZWNiYzYyOTVmNGJkMGRmNDIwMjc3MmI=
+    ZTVhNjY3YzcxZTVkMzRhZTkxZTNjNTYxOWVhNWIyZWFmYjJiOWYwMzU2ZTgw
+    NWY3Zjk4NDFkNmFjMjYxZTVjZDVkYWEzOGE4MjY5MmUxMTllMzY4ZmI2NzNi
+    OGMyN2RmOGQ1ZGY0YWM3NGYyZWUwMDkzYTIzOWYwOGE0Y2UyZTg=

data/lib/log_box.rb

@@ -2,36 +2,98 @@ require "log_box/version"
 require "fluent-logger"
 require "pp"
 
+class Hash
+  def symbolize_keys
+    inject({}) do |options, (key, value)|
+      value = value.symbolize_keys if defined?(value.symbolize_keys)
+      options[(key.to_sym rescue key) || key] = value
+      options
+    end
+  end
+end
+
 module LogBox
+  class << self
+    attr_accessor :configuration
+  end
+
+  def self.configure
+    self.configuration ||= Configuration.new
+    yield(configuration)
+  end
+
   DEFAULT_TAG = :thread
 
+  class Configuration
+    attr_accessor :logger, :default_tag
+
+    def initialize
+      @logger = Fluent::Logger::ConsoleLogger.new(STDOUT)
+      @default_tag = DEFAULT_TAG
+    end
+  end
+
+  # Following hash is stored into Thread.current[:_log_box]
+  # {
+  #  :new_tag =>
+  #  [{:time=>2014-01-01 15:38:15 -0800, :log=>"Hi-ho", :priority=>3}],
+  #
+  #  :thread=>
+  #   [{:time=>2014-01-01 15:38:21 -0800, :log=>"Hello"},
+  #    {:time=>2014-01-01 15:38:23 -0800, :log=>"Hello2"}]
+  # }
   def self.log(obj, options = {})
-    o = { tag: DEFAULT_TAG, time: current_time, log: obj }.merge(options)
+    return unless logger
+
+    o = { tag: default_tag,
+      time: current_time,
+      log: obj.is_a?(String) ? obj : obj.inspect
+    }.merge(options).symbolize_keys
+
+=begin
+    o = { tag: default_tag, time: current_time }.merge(options).symbolize_keys
+    if obj.is_a?(String)
+      o[:log] = obj
+    elsif obj.class < ActiveRecord::Base
+      o = o.merge(class: obj.class.to_s).merge(obj.attributes)
+    elsif obj.is_a?(Hash)
+      o.merge!(obj)
+    else
+      o[:log] = obj.inspect
+    end
+=end
     tag = o.delete :tag
     init_log_box_tag_if_not tag
     log_box[tag] << o
   end
 
-
-  # Following log will be stored into fluentd:
+  # Following log is stored into fluentd:
   # {
   #     "_id" : ObjectId("52c4a1f4e1eef37b9900001a"),
-  #     "tag" : "delayed_job",
+  #     "tag" : "thread",
   #     "logs" : [
   #         {
   #             "time" : "2014-01-01 15:16:43 -0800",
-  #             "log" : "Ho-ho",
-  #             "priority" : 3
+  #             "log" : "Hi-ho",
   #         }
   #     ],
   #     "time" : ISODate("2014-01-01T23:17:01.000Z")
   # }
   def self.flush(options = {})
-    o = { tag: DEFAULT_TAG }.merge(options)
+    return unless logger
+
+    o = { tag: default_tag }.merge(options).symbolize_keys
     tag = o[:tag]
     o[:logs] = log_box[tag]
     flush_to_fluentd o
-    delete_log_box_tag tag
+    discard tag
+  end
+
+  def self.discard(tag = nil)
+    return unless logger
+
+    tag ||= default_tag
+    log_box.delete tag
   end
 
   def self.display
@@ -42,8 +104,17 @@ module LogBox
     Thread.current[:_log_box]
   end
 
+
   private
 
+  def self.default_tag
+    self.configuration.default_tag || :thread
+  end
+
+  def self.logger
+    self.configuration.logger
+  end
+
   def self.current_time
     Time.now
   end
@@ -56,22 +127,18 @@ module LogBox
     init_log_box if log_box.nil?
   end
 
-  def self.init_log_box_tag_if_not(tag = :thread)
+  def self.init_log_box_tag_if_not(tag = nil)
+    tag ||= default_tag
     init_log_box_if_not
     log_box[tag] ||= []
   end
 
-  def self.delete_log_box_tag(tag = :thread)
-    log_box.delete tag
-  end
-
-  def self.init_log_box_tag(tag = :thread)
+  def self.init_log_box_tag(tag = nil)
+    tag ||= default_tag
     log_box[tag] = []
   end
 
-  Logger = Fluent::Logger::FluentLogger.new(nil)
-
   def self.flush_to_fluentd(result)
-    Logger.post 'log_box', result
+    logger.post 'log_box', result if logger
   end
 end

data/lib/log_box/version.rb

@@ -1,3 +1,3 @@
 module LogBox
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

data/spec/log_box_spec.rb

@@ -24,7 +24,13 @@ describe LogBox do
   let(:message_1_) { 'hello 1' }
   let(:message_2_) { 'hello 2' }
 
+  class DummyLogger
+    def initialize(); end
+    def post(tag, result); end
+  end
+
   before do
+    LogBox.configure do |config| config.logger = DummyLogger.new end
     LogBox.send(:init_log_box)
     LogBox.stub(:current_time).and_return(current_time_)
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: log_box
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Jun Yoshida
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-01 00:00:00.000000000 Z
+date: 2014-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   type: :development