lib/td/logger/agent/rails.rb in td-logger-0.2.5 vs lib/td/logger/agent/rails.rb in td-logger-0.2.6
- old
+ new
@@ -22,11 +22,13 @@
# disable logging
test:
EOF
class Config
- def initialize(conf)
+ 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
@@ -46,10 +48,11 @@
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?
@@ -77,11 +80,11 @@
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
@@ -100,11 +103,11 @@
logger.warn "Disabling Treasure Data logger."
return
end
begin
- return Config.new(conf)
+ return Config.new(conf, rails)
rescue
logger.warn "#{CONFIG_PATH}: #{$!}."
logger.warn "Disabling Treasure Data logger."
return
end
@@ -126,10 +129,10 @@
end
rails.middleware.use Agent::Middleware
if c.access_log_enabled?
- Agent.enable_access_log(c.access_log_table)
+ Agent.enable_access_log(c)
end
Agent::Rails.init_controller
Agent::Rails.init_model
end