applicaster-logger 0.2.1 → 0.3.0

data/lib/applicaster-logger.rb

@@ -1 +1,2 @@
 require 'applicaster/logger'
+require "applicaster/rack/request_uuid"

data/lib/applicaster/logger.rb

@@ -14,6 +14,9 @@ module Applicaster
           user_id: event.payload[:user_id],
         }
       end
+
+      app.middleware.insert_after ActionDispatch::RequestId,
+        Applicaster::Rack::RequestUuid
     end
 
     def self.setup_logger(app)
@@ -31,5 +34,18 @@ module Applicaster
           Applicaster::Logger::Formatter.new(facility: "delayed_job")
       end
     end
+
+    def self.with_request_uuid(uuid)
+      old, Thread.current[:logger_request_uuid] =
+        Thread.current[:logger_request_uuid], uuid
+
+      yield
+    ensure
+      Thread.current[:logger_request_uuid] = old
+    end
+
+    def self.current_request_uuid
+      Thread.current[:logger_request_uuid]
+    end
   end
 end

data/lib/applicaster/logger/formatter.rb

@@ -40,6 +40,11 @@ module Applicaster
         event[:host] ||= HOST
         event[:application] ||= Rails.application.config.applicaster_logger.application_name
         event[:environment] ||= Rails.env
+
+        if Applicaster::Logger.current_request_uuid
+          event[:request_uuid] ||= Applicaster::Logger.current_request_uuid
+        end
+
         default_fields.each do |field, value|
           event[field] ||= value
         end

data/lib/applicaster/logger/version.rb

@@ -1,5 +1,5 @@
 module Applicaster
   module Logger
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/lib/applicaster/rack/request_uuid.rb

@@ -0,0 +1,17 @@
+module Applicaster
+  module Rack
+    class RequestUuid
+      def initialize(app)
+        @app = app
+      end
+
+      def call(env)
+        request = ActionDispatch::Request.new(env)
+
+        Applicaster::Logger.with_request_uuid(request.uuid) do
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: applicaster-logger
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-01 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: logstash-logger
@@ -93,6 +93,7 @@ files:
 - lib/applicaster/logger/formatter.rb
 - lib/applicaster/logger/railtie.rb
 - lib/applicaster/logger/version.rb
+- lib/applicaster/rack/request_uuid.rb
 homepage: ''
 licenses:
 - MIT