td-logger 0.3.0 → 0.3.1

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2011-11-07 version 0.3.1
+
+* Added "debug_mode: true" option in config/treasure_data.yml
+* Updated fluent-logger to v0.4.1
+
+
 == 2011-11-05 version 0.3.0
 
 * Added new API: TD.event

data/README.rdoc

@@ -17,14 +17,12 @@ And then add +config/treasure_data.yml+ file as following:
     development:
       apikey: "YOUR_API_KEY"
       database: myapp
-      access_log_table: access
-      auto_create_table: true
+      debug_mode: true  # enable debug mode
     
     # logging via td-agent (fluent)
     production:
       agent: "localhost:24224"
       tag: td.myapp
-      access_log_table: access
     
     # disable logging
     test:

data/lib/td/logger/agent/rails/config.rb

@@ -26,6 +26,8 @@ module Agent::Rails
         else
           @auto_create_table = true
         end
+
+        @debug_mode = !!conf['debug_mode']
       end
 
       @access_log_table = conf['access_log_table']
@@ -33,7 +35,7 @@ module Agent::Rails
 
     attr_reader :agent_host, :agent_port, :tag
     attr_reader :apikey, :database, :auto_create_table
-    attr_reader :access_log_table
+    attr_reader :access_log_table, :debug_mode
 
     def agent_mode?
       @agent_host != nil

data/lib/td/logger/agent/rails/model.rb

@@ -86,7 +86,7 @@ module Agent::Rails
           else
             time = Time.now
           end
-          TreasureData::Logger.post(tag, data, time)
+          TreasureData::Logger.post_with_time(tag, data, time)
         end
       end
     end

data/lib/td/logger/agent/rails.rb

@@ -17,9 +17,9 @@ module Agent::Rails
     end
 
     if c.agent_mode?
-      ::TreasureData::Logger.open_agent(c.tag, :host=>c.agent_host, :port=>c.agent_port)
+      ::TreasureData::Logger.open_agent(c.tag, :host=>c.agent_host, :port=>c.agent_port, :debug=>c.debug_mode)
     else
-      ::TreasureData::Logger.open(c.database, :apikey=>c.apikey, :auto_create_table=>c.auto_create_table)
+      ::TreasureData::Logger.open(c.database, :apikey=>c.apikey, :auto_create_table=>c.auto_create_table, :debug=>c.debug_mode)
     end
 
     rails.middleware.use Agent::Rack::Hook

data/lib/td/logger/event.rb

@@ -46,8 +46,8 @@ module Logger
 
     attr_accessor :attribute
 
-    def post(action, record, time=nil)
-      TreasureData::Logger.post(action, @attribute.merge(record), time)
+    def post(action, record={})
+      TreasureData::Logger.post(action, @attribute.merge(record))
     end
 
     include Event

data/lib/td/logger/td_logger.rb

@@ -36,6 +36,8 @@ class TreasureDataLogger < Fluent::Logger::LoggerBase
       raise ArgumentError, ":apikey options is required"
     end
 
+    debug = !!options[:debug]
+
     require 'thread'
     require 'stringio'
     require 'zlib'
@@ -48,7 +50,11 @@ class TreasureDataLogger < Fluent::Logger::LoggerBase
     require 'td/client'
 
     @logger = ::Logger.new(STDERR)
-    @logger.level = ::Logger::INFO
+    if debug
+      @logger.level = ::Logger::DEBUG
+    else
+      @logger.level = ::Logger::INFO
+    end
 
     @client = TreasureData::Client.new(apikey)
 
@@ -92,8 +98,9 @@ class TreasureDataLogger < Fluent::Logger::LoggerBase
     end
   end
 
-  def post(tag, record, time=nil)
-    time ||= Time.now
+  def post_with_time(tag, record, time)
+    @logger.debug { "event: #{tag} #{record.to_json}" rescue nil }
+
     record[:time] ||= time.to_i
 
     tag = "#{@tag_prefix}.#{tag}" if @tag_prefix
@@ -140,9 +147,17 @@ class TreasureDataLogger < Fluent::Logger::LoggerBase
   end
 
   private
+  def to_msgpack(msg)
+    begin
+      msg.to_msgpack
+    rescue NoMethodError
+      JSON.load(JSON.dump(msg)).to_msgpack
+    end
+  end
+
   def add(db, table, msg)
     begin
-      data = msg.to_msgpack
+      data = to_msgpack(msg)
     rescue
       @logger.error("TreasureDataLogger: Can't convert to msgpack: #{msg.inspect}: #{$!}")
       return false
@@ -170,14 +185,6 @@ class TreasureDataLogger < Fluent::Logger::LoggerBase
     true
   end
 
-  def to_msgpack(msg)
-    begin
-      msg.to_msgpack
-    rescue NoMethodError
-      JSON.load(JSON.dump(msg)).to_msgpack
-    end
-  end
-
   def try_flush
     @mutex.synchronize do
       if @queue.empty?
@@ -217,12 +224,13 @@ class TreasureDataLogger < Fluent::Logger::LoggerBase
   end
 
   def upload(db, table, buffer)
-    @logger.debug "Uploading event logs to #{db}.#{table} table on Treasure Data"
     begin
       out = StringIO.new
       Zlib::GzipWriter.wrap(out) {|gz| gz.write buffer }
       stream = StringIO.new(out.string)
 
+      @logger.debug "Uploading event logs to #{db}.#{table} table on Treasure Data (#{stream.size} bytes)"
+
       @client.import(db, table, "msgpack.gz", stream, stream.size)
     rescue TreasureData::NotFoundError
       unless @auto_create_table

data/lib/td/logger/version.rb

@@ -1,7 +1,7 @@
 module TreasureData
 module Logger
 
-VERSION = '0.3.0'
+VERSION = '0.3.1'
 
 end
 end

data/lib/td/logger.rb

@@ -18,8 +18,12 @@ module Logger
     @@logger = Fluent::Logger::NullLogger.new
   end
 
-  def self.post(tag, record, time=nil)
-    @@logger.post(tag, record, time)
+  def self.post(tag, record={})
+    @@logger.post(tag, record)
+  end
+
+  def self.post_with_time(tag, record={}, time)
+    @@logger.post_with_time(tag, record, time)
   end
 end
 end
@@ -41,8 +45,12 @@ module TreasureData
     TreasureData::Logger.open_null
   end
 
-  def self.post(tag, record, time=nil)
-    TreasureData::Logger.post(tag, record, time)
+  def self.post(tag, record={})
+    TreasureData::Logger.post(tag, record)
+  end
+
+  def self.post_with_time(tag, record={}, time)
+    TreasureData::Logger.post_with_time(tag, record, time)
   end
 
   def self.event

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-04 00:00:00.000000000Z
+date: 2011-11-07 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack
-  requirement: &70213731736700 !ruby/object:Gem::Requirement
+  requirement: &70341448070920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 0.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *70213731736700
+  version_requirements: *70341448070920
 - !ruby/object:Gem::Dependency
   name: td-client
-  requirement: &70213731736040 !ruby/object:Gem::Requirement
+  requirement: &70341448070120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,18 +32,18 @@ dependencies:
         version: 0.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *70213731736040
+  version_requirements: *70341448070120
 - !ruby/object:Gem::Dependency
   name: fluent-logger
-  requirement: &70213731735340 !ruby/object:Gem::Requirement
+  requirement: &70341448069220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *70213731735340
+  version_requirements: *70341448069220
 description: 
 email: 
 executables: []