td-logger 0.3.15 → 0.3.16

data/ChangeLog

@@ -1,3 +1,8 @@
+== 2012-11-17 version 0.3.16
+
+* Disable logger when the key for the ennvironment is missing. issue #6
+
+
 == 2012-11-14 version 0.3.15
 
 * Removing InstanceMethods as it is deprecated in Rails 3.2 and

data/VERSION

@@ -1 +1 @@
-0.3.15
+0.3.16

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

@@ -3,8 +3,8 @@ module Logger
 module Agent::Rails
 
   CONFIG_PATH = ENV['TREASURE_DATA_YML'] || 'config/treasure_data.yml'
-  CONFIG_PATH_EY_LOCAL = 'config/ey_services_config_local.yml'
-  CONFIG_PATH_EY_DEPLOY = 'config/ey_services_config_deploy.yml'
+  CONFIG_PATH_EY_LOCAL = "#{::Rails.root}/config/ey_services_config_local.yml"
+  CONFIG_PATH_EY_DEPLOY = "#{::Rails.root}/config/ey_services_config_deploy.yml"
 
   require 'td/logger/agent/rack'
   require 'td/logger/agent/rails/config'
@@ -13,7 +13,8 @@ module Agent::Rails
 
   def self.init(rails)
     c = Config.init
-    unless c
+    if c.disabled
+      warn 'Disabling Treasure Data event logger.'
       ::TreasureData::Logger.open_null
       return false
     end

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

@@ -3,7 +3,7 @@ module Logger
 module Agent::Rails
 
   class Config
-    def initialize(conf)
+    def assign_conf(conf)
       if agent = conf['agent']
         host, port = agent.split(':',2)
         port = (port || 24224).to_i
@@ -36,6 +36,11 @@ module Agent::Rails
     attr_reader :agent_host, :agent_port, :tag
     attr_reader :apikey, :database, :auto_create_table
     attr_reader :access_log_table, :debug_mode
+    attr_accessor :disabled
+
+    def initialize
+      @disabled = false
+    end
 
     def agent_mode?
       @agent_host != nil
@@ -46,77 +51,47 @@ module Agent::Rails
     end
 
     def self.init
-      logger = ::Logger.new(STDERR)
-
-      if CONFIG_PATH[0] == ?/
-        config_path = CONFIG_PATH
-      else
-        config_path = "#{::Rails.root}/#{CONFIG_PATH}"
-      end
+      c = Config.new
+      config_path = CONFIG_PATH.start_with?('/') ? CONFIG_PATH : "#{::Rails.root}/#{CONFIG_PATH}"
 
       if File.exist?(config_path)
-        load_file(logger, config_path)
-      elsif File.exist?("#{::Rails.root}/#{CONFIG_PATH_EY_DEPLOY}")
-        load_file_ey(logger, "#{::Rails.root}/#{CONFIG_PATH_EY_DEPLOY}")
-      elsif File.exist?("#{::Rails.root}/#{CONFIG_PATH_EY_LOCAL}")
-        load_file_ey(logger, "#{::Rails.root}/#{CONFIG_PATH_EY_LOCAL}")
+        c.load_file(config_path)
+      elsif File.exist?(CONFIG_PATH_EY_DEPLOY)
+        c.load_file_ey(CONFIG_PATH_EY_DEPLOY)
+      elsif File.exist?(CONFIG_PATH_EY_LOCAL)
+        c.load_file_ey(CONFIG_PATH_EY_LOCAL)
       else
-        load_env(logger)
+        c.load_env
       end
-    end
 
-    def self.load_file(logger, path="#{::Rails.root}/#{CONFIG_PATH}")
-      require 'yaml'
-      require 'erb'
+      return c
+    rescue
+      warn "Disabling Treasure Data event logger: #{$!}"
+      c.disabled = true
+      return c
+    end
 
-      begin
-        src = File.read(path)
-        yaml = ERB.new(src).result
-        env_conf = YAML.load(yaml)
-      rescue
-        logger.warn "WARNING: Can't load #{path} file: #{$!}"
-        logger.warn "WARNING: Disabling Treasure Data event logger."
-        return nil
-      end
+    def load_file(path)
+      conf = load_yaml(path)[::Rails.env]
 
-      conf = env_conf[::Rails.env] if env_conf.is_a?(Hash)
       unless conf
-        logger.warn "WARNING: #{path} doesn't include setting for current environment (#{::Rails.env})."
-        logger.warn "WARNING: Disabling Treasure Data event logger."
-        return nil
+        @disabled = true
+        return
       end
 
-      begin
-        return Config.new(conf)
-      rescue
-        logger.warn "WARNING: #{path}: #{$!}."
-        logger.warn "WARNING: Disabling Treasure Data event logger."
-        return nil
-      end
+      assign_conf(conf)
     end
 
-    def self.load_file_ey(logger, path)
-      require 'yaml'
-      require 'erb'
-
-      begin
-        src = File.read(path)
-        yaml = ERB.new(src).result
-        env_conf = YAML.load(yaml)
-      rescue
-        logger.warn "WARNING: Can't load #{path} file: #{$!}"
-        logger.warn "WARNING: Disabling Treasure Data event logger."
-        return nil
-      end
+    def load_file_ey(path)
+      conf = load_yaml(path)
+      apikey = conf['td']['TREASURE_DATA_API_KEY'] if conf.is_a?(Hash) and conf['td'].is_a?(Hash)
 
-      apikey = env_conf['td']['TREASURE_DATA_API_KEY'] if env_conf.is_a?(Hash) and env_conf['td'].is_a?(Hash)
       unless apikey
-        logger.warn "WARNING: #{path} does not have a configuration of API key."
-        logger.warn "WARNING: Disabling Treasure Data event logger."
-        return nil
+        @disabled = true
+        return
       end
 
-      return Config.new({
+      assign_conf({
         'apikey' => apikey,
         'database' => ENV['TREASURE_DATA_DB'] || "rails_#{::Rails.env}",
         'access_log_table' => ENV['TREASURE_DATA_ACCESS_LOG_TABLE'],
@@ -124,22 +99,30 @@ module Agent::Rails
       })
     end
 
-    def self.load_env(logger)
+    def load_env
       apikey = ENV['TREASURE_DATA_API_KEY'] || ENV['TD_API_KEY']
 
       unless apikey
-        logger.warn "WARNING: #{CONFIG_PATH} does not exist."
-        logger.warn "WARNING: Disabling Treasure Data event logger."
-        return nil
+        @disabled = true
+        return
       end
 
-      return Config.new({
+      assign_conf({
         'apikey' => apikey,
         'database' => ENV['TREASURE_DATA_DB'] || "rails_#{::Rails.env}",
         'access_log_table' => ENV['TREASURE_DATA_ACCESS_LOG_TABLE'],
         'auto_create_table' => true
       })
     end
+
+    def load_yaml(path)
+      require 'yaml'
+      require 'erb'
+
+      src = File.read(path)
+      yaml = ERB.new(src).result
+      YAML.load(yaml)
+    end
   end
 
 end

data/lib/td/logger/version.rb

@@ -1,7 +1,7 @@
 module TreasureData
 module Logger
 
-VERSION = '0.3.15'
+VERSION = '0.3.16'
 
 end
 end

data/spec/rails_config_spec.rb

@@ -56,6 +56,7 @@ describe TreasureData::Logger::Agent::Rails::Config do
       ENV['TREASURE_DATA_API_KEY'] = 'test1'
       ENV['TREASURE_DATA_DB'] = 'db1'
       c = TreasureData::Logger::Agent::Rails::Config.init
+      c.disabled.should == false
       c.agent_mode?.should == false
       c.apikey.should == 'test1'
       c.database.should == 'db1'
@@ -73,6 +74,7 @@ test:
 EOF
       }
       c = TreasureData::Logger::Agent::Rails::Config.init
+      c.disabled.should == false
       c.agent_mode?.should == false
       c.apikey.should == 'test2'
       c.database.should == 'db2'
@@ -80,6 +82,20 @@ EOF
       c.debug_mode.should == true
     end
 
+    it 'load_file without test' do
+      FileUtils.mkdir_p("#{TMP_DIR}/config")
+      File.open("#{TMP_DIR}/config/treasure_data.yml", "w") {|f|
+        f.write <<EOF
+development:
+  apikey: test2
+  database: db2
+  debug_mode: true
+EOF
+      }
+      c = TreasureData::Logger::Agent::Rails::Config.init
+      c.disabled.should == true
+    end
+
     it 'prefer file than env' do
       ENV['TREASURE_DATA_API_KEY'] = 'test3'
       ENV['TREASURE_DATA_DB'] = 'db3'
@@ -94,6 +110,7 @@ test:
 EOF
       }
       c = TreasureData::Logger::Agent::Rails::Config.init
+      c.disabled.should == false
       c.agent_mode?.should == false
       c.apikey.should == 'test4'
       c.database.should == 'db4'
@@ -111,6 +128,7 @@ test:
 EOF
       }
       c = TreasureData::Logger::Agent::Rails::Config.init
+      c.disabled.should == false
       c.agent_mode?.should == true
       c.tag.should == 'td.db5'
       c.agent_host.should == 'localhost'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: td-logger
 version: !ruby/object:Gem::Version
-  version: 0.3.15
+  version: 0.3.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-14 00:00:00.000000000 Z
+date: 2012-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: msgpack