lib/td/logger.rb in td-logger-0.2.8 vs lib/td/logger.rb in td-logger-0.3.0

@@ -1,31 +1,77 @@
 require 'fluent/logger'
 
 module TreasureData
+module Logger
+  autoload :TreasureDataLogger, 'td/logger/td_logger'
 
-def self.open(apikey, database, auto_create_table=false)
-  require 'td/logger/tdlog'
-  TreasureData::Logger::TreasureDataLogger.open(apikey, database, auto_create_table)
-end
+  @@logger = nil
 
-def self.open_agent(tag, agent_host, agent_port)
-  Fluent::Logger::FluentLogger.open(tag, agent_host, agent_port)
-end
+  def self.open(database, options={})
+    @@logger = TreasureData::Logger::TreasureDataLogger.new(database, options)
+  end
 
-def self.log(tag, record)
-  Fluent::Logger.post(tag, record)
-end
+  def self.open_agent(tag, options={})
+    @@logger = Fluent::Logger::FluentLogger.new(tag, options)
+  end
 
+  def self.open_null
+    @@logger = Fluent::Logger::NullLogger.new
+  end
+
+  def self.post(tag, record, time=nil)
+    @@logger.post(tag, record, time)
+  end
 end
+end
 
 
-class Time
-  def to_msgpack(out = '')
-    to_i.to_msgpack(out)
+# shortcut methods
+module TreasureData
+  require 'td/logger/event'
+
+  def self.open(database, options={})
+    TreasureData::Logger.open(database, options)
   end
+
+  def self.open_agent(tag, options={})
+    TreasureData::Logger.open_agent(tag, options)
+  end
+
+  def self.open_null
+    TreasureData::Logger.open_null
+  end
+
+  def self.post(tag, record, time=nil)
+    TreasureData::Logger.post(tag, record, time)
+  end
+
+  def self.event
+    TreasureData::Logger.event
+  end
+
+  Event = TreasureData::Logger::Event
+
+  # backward compatibility
+  def self.log(*args)  # :nodoc:
+    TreasureData::Logger.post(*args)
+  end
 end
 
+# shortcut constants
+TD = TreasureData
 
-if defined? Rails
-  require 'td/logger/agent/rails'
+# implement Time#to_msgpack
+unless Time.now.respond_to?(:to_msgpack)
+  class Time
+    def to_msgpack(out='')
+      strftime("%Y-%m-%d %H:%M:%S %z").to_msgpack(out)
+    end
+  end
+end
+
+module TreasureData::Logger::Agent
+  if defined? ::Rails
+    require 'td/logger/agent/rails'
+  end
 end