rails.rb in td-logger-0.3.0

- old
+ new
@@ -1,158 +1,50 @@
 module TreasureData
 module Logger
-module Agent
-  module Rails
+module Agent::Rails
 
-    CONFIG_PATH = 'config/treasure_data.yml'
+  CONFIG_PATH = 'config/treasure_data.yml'
 
-    CONFIG_SAMPLE = <<EOF
-# logging to Treasure Data directly
-development:
-  apikey: "YOUR_API_KEY"
-  database: myapp
-  access_log_table: access
-  auto_create_table: true
+  require 'td/logger/agent/rack'
+  require 'td/logger/agent/rails/config'
+  require 'td/logger/agent/rails/controller'
+  #require 'td/logger/agent/rails/model'
 
-# logging via td-agent
-production:
-  agent: "localhost:24224"
-  tag: td.myapp
-  access_log_table: access
-
-# disable logging
-test:
-EOF
-
-    class Config
-      def initialize(conf, rails_config)
-        @rails_config = rails_config
-
-        if agent = conf['agent']
-          host, port = agent.split(':',2)
-          port = (port || 24224).to_i
-          @agent_host = host
-          @agent_port = port
-
-          @tag = conf['tag']
-          @tag ||= conf['database']
-          raise "'tag' nor 'database' options are not set" unless @tag
-
-        else
-          @apikey = conf['apikey']
-          raise "'apikey' option is not set" unless @apikey
-
-          @database = conf['database']
-          raise "'database' option is not set" unless @database
-
-          @auto_create_table = !!conf['auto_create_table']
-        end
-
-        @access_log_table = conf['access_log_table']
-      end
-
-      attr_reader :rails_config
-      attr_reader :agent_host, :agent_port, :tag
-      attr_reader :apikey, :database, :auto_create_table
-      attr_reader :access_log_table
-
-      def agent_mode?
-        @agent_host != nil
-      end
-
-      def access_log_enabled?
-        !@access_log_table.nil? && !@access_log_table.empty?
-      end
+  def self.init(rails)
+    c = Config.init
+    unless c
+      ::TreasureData::Logger.open_null
+      return false
     end
 
-    def self.read_config(rails)
-      require 'yaml'
-      require 'erb'
-      logger = ::Rails.logger || ::Logger.new(STDERR)
-
-      unless File.exist?(CONFIG_PATH)
-        apikey = ENV['TREASURE_DATA_API_KEY'] || ENV['TD_API_KEY']
-        unless apikey
-          logger.warn "TREASURE_DATA_API_KEY environment variable is not set"
-          logger.warn "#{CONFIG_PATH} does not exist."
-          logger.warn "Disabling Treasure Data logger."
-          return
-        end
-        return Config.new({
-          'apikey' => apikey,
-          'database' => ENV['TREASURE_DATA_DB'] || "rails_#{::Rails.env}",
-          'access_log_table' => ENV['TREASURE_DATA_TABLE'] || 'web_access',
-          'auto_create_table' => true
-        }, rails)
-      end
-
-      begin
-        src = File.read("#{::Rails.root}/#{CONFIG_PATH}")
-        yaml = ERB.new(src).result
-        env_conf = YAML.load(yaml)
-      rescue
-        logger.warn "Can't load #{CONFIG_PATH} file: #{$!}"
-        logger.warn "Disabling Treasure Data logger."
-        logger.warn "Example:"
-        logger.warn CONFIG_SAMPLE
-        return
-      end
-
-      conf = env_conf[::Rails.env]
-      unless conf
-        logger.warn "#{CONFIG_PATH} doesn't include setting for current environment (#{::Rails.env})."
-        logger.warn "Disabling Treasure Data logger."
-        return
-      end
-
-      begin
-        return Config.new(conf, rails)
-      rescue
-        logger.warn "#{CONFIG_PATH}: #{$!}."
-        logger.warn "Disabling Treasure Data logger."
-        return
-      end
+    if c.agent_mode?
+      ::TreasureData::Logger.open_agent(c.tag, :host=>c.agent_host, :port=>c.agent_port)
+    else
+      ::TreasureData::Logger.open(c.database, :apikey=>c.apikey, :auto_create_table=>c.auto_create_table)
     end
 
-    def self.init(rails)
-      require 'td/logger/agent/middleware'
-      require 'td/logger/agent/access_log'
-      require 'td/logger/agent/rails/controller'
-      require 'td/logger/agent/rails/model'
+    rails.middleware.use Agent::Rack::Hook
 
-      c = read_config(rails)
-      return unless c
-
-      if c.agent_mode?
-        ::TreasureData.open_agent(c.tag, c.agent_host, c.agent_port)
-      else
-        ::TreasureData.open(c.apikey, c.database, c.auto_create_table)
-      end
-
-      rails.middleware.use Agent::Middleware
-
-      if c.access_log_enabled?
-        Agent.enable_access_log(c)
-      end
-      Agent::Rails.init_controller
-      Agent::Rails.init_model
+    Agent::Rack::Hook.before do |env|
+      TreasureData::Logger.event.attribute.clear
     end
 
+    Agent::Rails::ControllerExtension.init
+    #Agent::Rails::AccessLogger.init(c.access_log_table) if c.access_log_enabled?
+    #Agent::Rails::ModelExtension.init
+
+    true
   end
-end
-end
-end
 
-if defined? ::Rails
   if ::Rails.respond_to?(:version) && ::Rails.version =~ /^3/
-    module TreasureData
-      class Railtie < ::Rails::Railtie
-        initializer "treasure_data_agent.start_plugin" do |app|
-          TreasureData::Logger::Agent::Rails.init(app.config)
-        end
+    class Railtie < ::Rails::Railtie
+      initializer "treasure_data_logger.start_plugin" do |app|
+        TreasureData::Logger::Agent::Rails.init(app.config)
       end
     end
   else
     TreasureData::Logger::Agent::Rails.init(::Rails.configuration)
   end
-end
 
+end
+end
+end