td-logger 0.2.0 → 0.2.1

data/ChangeLog

@@ -1,4 +1,10 @@
 
+== 2011-09-03 version 0.2.1
+
+* Logs HTTP method, URI and UA by default in access log.
+* Fixes Rails 3.1 compatibility
+
+
 == 2011-08-28 version 0.2.0
 
 * Rewritten

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

@@ -18,13 +18,16 @@ module Agent
         end
 
   ACCESS_LOG_PRESET_PARAM_KEYS = {
-    'controller' => 'controller',
-    'action' => 'action',
+    'controller' => :controller,
+    'action' => :action,
   }
 
   ACCESS_LOG_PRESET_ENV_KEYS = {
-    'remote_addr' => 'REMOTE_ADDR',
+    'ip'      => 'REMOTE_ADDR',
+    'method'  => 'REQUEST_METHOD',
+    'uri'     => 'REQUEST_URI',
     'referer' => 'HTTP_REFERER',
+    'ua'      => 'HTTP_USER_AGENT'
   }
 
   def self.enable_access_log(tag)

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

@@ -28,6 +28,22 @@ production:
 test:
 EOF
 
+    def self.rails_env
+      if defined?(RAILS_ENV) && RAILS_ENV.to_s != ''
+        RAILS_ENV.to_s
+      else
+        ::Rails.env
+      end
+    end
+    
+    def self.rails_root
+      if defined?(RAILS_ROOT) && RAILS_ROOT.to_s != ''
+        RAILS_ROOT.to_s
+      else
+        ::Rails.root
+      end
+    end
+
     class Config
       def initialize(conf)
         if agent = conf['agent']
@@ -69,18 +85,18 @@ EOF
     def self.read_config(rails)
       logger = ::Rails.logger || ::Logger.new(STDOUT)
       begin
-        yaml = YAML.load_file("#{RAILS_ROOT}/#{CONFIG_PATH}")
+        yaml = YAML.load_file("#{rails_root}/#{CONFIG_PATH}")
       rescue
         logger.warn "Can't load #{CONFIG_PATH} file."
         logger.warn "  #{$!}"
         logger.warn "Put the following file:"
-        logger.warn sample
+        logger.warn CONFIG_SAMPLE
         return
       end
 
-      conf = yaml[RAILS_ENV]
+      conf = yaml[rails_env]
       unless conf
-        logger.warn "#{CONFIG_PATH} doesn't include setting for current environment (#{RAILS_ENV})."
+        logger.warn "#{CONFIG_PATH} doesn't include setting for current environment (#{rails_env})."
         logger.warn "Disabling Treasure Data logger."
         return
       end

data/lib/td/logger/version.rb

@@ -1,7 +1,7 @@
 module TreasureData
 module Logger
 
-VERSION = '0.2.0'
+VERSION = '0.2.1'
 
 end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: td-logger
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Sadayuki Furuhashi
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-28 00:00:00 +09:00
+date: 2011-09-03 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency