lib/flapjack/rack_logger.rb in flapjack-0.6.50 vs lib/flapjack/rack_logger.rb in flapjack-0.6.51

@@ -1,8 +1,47 @@
 #!/usr/bin/env ruby
 
 module Flapjack
-  class RackLogger < ::Logger
-    # Works around a 1.8-specific call to a Logger method in Rack::CommonLogger
-    def write(msg); self.send(:"<<", msg); end
+
+  class CommonLogger < Rack::CommonLogger
+
+    alias_method :orig_log, :log
+
+    private
+
+    def log(env, status, header, began_at)
+      ret = orig_log(env, status, header, began_at)
+      @logger.flush if @logger.is_a?(Flapjack::AsyncLogger)
+      ret
+    end
+
   end
-end
\ No newline at end of file
+
+  # from http://stackoverflow.com/questions/6427033/how-do-i-log-asynchronous-thinsinatrarack-requests
+ class AsyncLogger < ::Logger
+
+    attr_accessor :messages
+
+    def initialize(logdev, shift_age = 0, shift_size = 1048576)
+      @messages = {}
+      super(logdev, shift_age, shift_size)
+    end
+
+    def write(message)
+      stack << message
+    end
+
+    def stack
+      # This is the important async awareness
+      # It stores messages for each fiber separately
+      @messages[Fiber.current.object_id] ||= []
+    end
+
+    def flush
+      stack.each do |msg|
+        self.send(:"<<", msg)
+      end
+      @messages.delete(Fiber.current.object_id)
+    end
+  end
+
+end