sawmill 0.1.14 → 0.1.15

data/History.rdoc

@@ -1,3 +1,7 @@
+=== 0.1.15 / 2011-10-24
+
+* 0.1.14 was inadvertently released before testing was complete. Fixed several stats logs issues.
+
 === 0.1.14 / 2011-10-24
 
 * Support for stats logs.

data/Version

@@ -1 +1 @@
-0.1.14
+0.1.15

data/lib/sawmill/log_record_middleware.rb

@@ -51,7 +51,7 @@ module Sawmill
     # Recognized options include:
     # 
     # [<tt>:request_id_key</tt>]
-    #   The name of a rack environment key where the record ID should be
+    #   The name of a rack environment key where the request ID should be
     #   stored. If not specified, defaults to "sawmill.request_id".
     # [<tt>:start_time_attribute</tt>]
     #   If present, logs an attribute with this name with the starting

data/lib/sawmill/stats_middleware.rb

@@ -55,9 +55,9 @@ module Sawmill
     # [<tt>:stats_data_key</tt>]
     #   The name of a rack environment key where the stats data should
     #   be stored. If not specified, defaults to "sawmill.stats_data".
-    # [<tt>:record_id_key</tt>]
-    #   The name of a rack environment key where the record ID can be
-    #   obtained. If not specified, defaults to "sawmill.record_id".
+    # [<tt>:request_id_key</tt>]
+    #   The name of a rack environment key where the request ID can be
+    #   obtained. If not specified, defaults to "sawmill.request_id".
     # [<tt>:start_time_stat</tt>]
     #   If present, stores the starting timestamp for the request in the
     #   given stat key. If absent, does not store this information.
@@ -67,8 +67,8 @@ module Sawmill
     # [<tt>:elapsed_time_stat</tt>]
     #   If present, stores the elapsed time for the request in the
     #   given stat key. If absent, does not store this information.
-    # [<tt>:log_record_id_stat</tt>]
-    #   If present, stores the log record ID for the request in the
+    # [<tt>:request_id_stat</tt>]
+    #   If present, stores the request ID for the request in the
     #   given stat key. If absent, does not store this information.
     # [<tt>:pre_logger</tt>]
     #   A proc that is called at the start of the request, and passed the
@@ -87,11 +87,11 @@ module Sawmill
       @logger = logger_ || Logger.new(:progname => 'stats', :processor => Formatter.new(::STDOUT))
       @level = level_ || :ANY
       @stats_data_key = opts_[:stats_data_key] || 'sawmill.stats_data'
-      @record_id_key = opts_[:record_id_key] || 'sawmill.record_id'
+      @request_id_key = opts_[:request_id_key] || 'sawmill.request_id'
       @start_time_stat = opts_[:start_time_stat]
       @end_time_stat = opts_[:end_time_stat]
       @elapsed_time_stat = opts_[:elapsed_time_stat]
-      @log_record_id_stat = opts_[:log_record_id_stat]
+      @request_id_stat = opts_[:request_id_stat]
       @pre_logger = opts_[:pre_logger]
       @post_logger = opts_[:post_logger]
     end
@@ -111,8 +111,8 @@ module Sawmill
         return @app.call(env_)
       ensure
         if enable_log_
-          if @log_record_id_stat
-            stats_data_[@log_record_id_stat.to_s] = env_[@record_id_key]
+          if @request_id_stat
+            stats_data_[@request_id_stat.to_s] = env_[@request_id_key]
           end
           if @post_logger
             enable_log_ &&= @post_logger.call(stats_data_, env_)

data/lib/sawmill/stats_railtie.rb

@@ -70,11 +70,11 @@ module Sawmill
         @length_limit = nil
         @level = :ANY
         @progname = 'rails'
-        @stats_data_key = 'sawmill.stats_hash'
+        @stats_data_key = 'sawmill.stats_data'
         @start_time_stat = nil
         @end_time_stat = nil
         @elapsed_time_stat = nil
-        @log_record_id_stat = nil
+        @request_id_stat = nil
         @pre_logger = nil
         @post_logger = nil
         @generated_logger = nil
@@ -109,7 +109,7 @@ module Sawmill
       # This option is passed to Sawmill::StatsMiddleware::new
       attr_accessor :elapsed_time_stat
       # This option is passed to Sawmill::StatsMiddleware::new
-      attr_accessor :log_record_id_stat
+      attr_accessor :request_id_stat
       
       # Access the logger after it is generated
       attr_reader :generated_logger
@@ -162,8 +162,8 @@ module Sawmill
       stats_config_._set_generated_logger(logger_)
       app_.config.middleware.insert_after(::Rack::Runtime,
         ::Sawmill::StatsMiddleware, logger_, stats_config_.level,
-        :log_record_id_stat => sawmill_config_ && stats_config_.log_record_id_stat ?
-          stats_config_.log_record_id_stat : nil,
+        :request_id_stat => sawmill_config_ && stats_config_.request_id_stat ?
+          stats_config_.request_id_stat : nil,
         :stats_data_key => stats_config_.stats_data_key,
         :start_time_stat => stats_config_.start_time_stat,
         :end_time_stat => stats_config_.end_time_stat,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sawmill
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &2153021800 !ruby/object:Gem::Requirement
+  requirement: &2164525840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,7 +21,7 @@ dependencies:
         version: 0.4.3
   type: :runtime
   prerelease: false
-  version_requirements: *2153021800
+  version_requirements: *2164525840
 description: Sawmill is a logging and log analysis system for Ruby. It extends the
   basic Ruby logging facility with log records and parsing abilities.
 email: dazuma@gmail.com