applicaster-logger 0.5.8 → 0.6.0

data/lib/applicaster-logger.rb

@@ -1,3 +1,3 @@
 require 'applicaster/logger'
-require "applicaster/rack/request_uuid"
+require "applicaster/rack/request_data"
 require "applicaster/sidekiq/middleware"

data/lib/applicaster/logger.rb

@@ -16,7 +16,7 @@ module Applicaster
       end
 
       app.middleware.insert_after ActionDispatch::RequestId,
-        Applicaster::Rack::RequestUuid
+        Applicaster::Rack::RequestData
     end
 
     def self.setup_logger(app)
@@ -53,17 +53,17 @@ module Applicaster
       end
     end
 
-    def self.with_request_uuid(uuid)
-      old, Thread.current[:logger_request_uuid] =
-        Thread.current[:logger_request_uuid], uuid
+    def self.with_thread_data(data)
+      old, Thread.current[:logger_thread_data] =
+        Thread.current[:logger_thread_data], data
 
       yield
     ensure
-      Thread.current[:logger_request_uuid] = old
+      Thread.current[:logger_thread_data] = old
     end
 
-    def self.current_request_uuid
-      Thread.current[:logger_request_uuid]
+    def self.current_thread_data
+      Thread.current[:logger_thread_data] || {}
     end
   end
 end

data/lib/applicaster/logger/formatter.rb

@@ -42,8 +42,8 @@ module Applicaster
         event[:environment] ||= Rails.env
         event[:token] = ENV['LOGZIO_TOKEN'] if ENV['LOGZIO_TOKEN']
 
-        if Applicaster::Logger.current_request_uuid
-          event[:request_uuid] ||= Applicaster::Logger.current_request_uuid
+        Applicaster::Logger.current_thread_data.each do |field, value|
+          event[field] = value
         end
 
         default_fields.each do |field, value|

data/lib/applicaster/logger/version.rb

@@ -1,5 +1,5 @@
 module Applicaster
   module Logger
-    VERSION = "0.5.8"
+    VERSION = "0.6.0"
   end
 end

data/lib/applicaster/rack/{request_uuid.rb → request_data.rb}

@@ -1,17 +1,23 @@
 module Applicaster
   module Rack
-    class RequestUuid
+    class RequestData
       def initialize(app)
         @app = app
       end
 
       def call(env)
-        request = ActionDispatch::Request.new(env)
-
-        Applicaster::Logger.with_request_uuid(request.uuid) do
+        Applicaster::Logger.with_thread_data(request_data(env)) do
           @app.call(env)
         end
       end
+
+      def request_data(env)
+        request = ActionDispatch::Request.new(env)
+        {
+          request_uuid: request.uuid,
+          remote_ip: request.remote_ip,
+        }
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: applicaster-logger
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-26 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-logger
@@ -93,7 +93,7 @@ files:
 - lib/applicaster/logger/formatter.rb
 - lib/applicaster/logger/railtie.rb
 - lib/applicaster/logger/version.rb
-- lib/applicaster/rack/request_uuid.rb
+- lib/applicaster/rack/request_data.rb
 - lib/applicaster/sidekiq/middleware.rb
 homepage: ''
 licenses:
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 235561259936867571
+      hash: 224925595209252311
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -119,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 235561259936867571
+      hash: 224925595209252311
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23