brontes3d-production_log_analyzer 2009022403 → 2009072100

data/lib/rack_logging_per_proc.rb

@@ -0,0 +1,57 @@
+class RackLoggingPerProc
+
+  def self.logger_mutex
+   @@logger_mutex ||= Mutex.new
+  end
+  
+  def self.logs
+    @@logs ||= []
+  end
+  
+  def self.clear_logs
+    @@logs = []
+  end
+
+  def initialize app, log_path_prefix
+    @app = app
+    @log_path_prefix = log_path_prefix
+    @process_logger = false
+  end
+
+  def call env
+    RackLoggingPerProc.logger_mutex.synchronize do
+      unless @process_logger
+        @process_logger = ActiveSupport::BufferedLogger.new(@log_path_prefix + "_#{Process.pid}" + ".log")
+        @process_logger.debug("\nProcess logging started")
+        RAILS_DEFAULT_LOGGER.instance_eval do
+          class << self
+            def add(severity, message = nil, progname = nil, &block)
+              to_return = super
+              if to_return
+                RackLoggingPerProc.logger_mutex.synchronize do
+                  RackLoggingPerProc.logs << [severity, to_return.strip]
+                end
+              end
+              to_return
+            end
+          end
+        end
+      end
+    end
+    
+    start_time = Time.now
+    @app.call(env)    
+  ensure
+    RackLoggingPerProc.logger_mutex.synchronize do
+      @process_logger.info("RECEIVE_REQUEST (#{Process.pid}) #{env['REQUEST_METHOD']} #{env['REQUEST_URI']} #{start_time}")        
+      RackLoggingPerProc.logs.each do |to_log|
+        @process_logger.add(to_log[0], to_log[1])
+      end
+      @process_logger.info("#{Time.now} (#{Process.pid}) RESPONSE_SENT")
+      @process_logger.info("\n")
+      @process_logger.flush
+      RackLoggingPerProc.clear_logs
+    end
+  end
+
+end

data/test/{test_passenger_log_per_proc.rb → test_rack_logging_per_proc.rb}

@@ -2,12 +2,11 @@ require File.dirname(__FILE__) + '/test_helper'
 
 require 'rubygems'
 require 'active_support'
-require 'phusion_passenger/rack/request_handler'
 
-require 'passenger_log_per_proc'
+require 'rack_logging_per_proc'
 
-SCRATCH_DIR = File.join(Dir.tmpdir, "passenger_log_proc_test")
-RAILS_LOG_LOCATION = File.join(SCRATCH_DIR, "test_passenger_rails.log")
+SCRATCH_DIR = File.join(Dir.tmpdir, "rack_logging_proc_test")
+RAILS_LOG_LOCATION = File.join(SCRATCH_DIR, "test_rack_rails.log")
 RAILS_DEFAULT_LOGGER = ActiveSupport::BufferedLogger.new(RAILS_LOG_LOCATION)
 
 class TestPassengerLogPerProc < Test::Unit::TestCase
@@ -21,32 +20,33 @@ class TestPassengerLogPerProc < Test::Unit::TestCase
     FileUtils.rm_rf(SCRATCH_DIR)    
   end
   
-  def run_a_request(count = 1)
+  def run_a_request(app, count = 1)
     Process.fork do
       count.times do |i|
-        r, w = IO.pipe    
-        req_handler = PhusionPassenger::Rack::RequestHandler.new(w, Proc.new{ 
-          RAILS_DEFAULT_LOGGER.debug("hi #{i} from #{Process.pid}")
-          [200, {}, "hi"] })
         env = {}
         env["PATH_INFO"] = "/"
-        input, output = IO.pipe
-        req_handler.send(:process_request, env, input, output)
+        env["count"] = i
+        app.call(env)
       end
     end
   end
   
-  def test_todo    
-    pid_before = run_a_request
+  def test_todo
+    app = lambda do |env| 
+      RAILS_DEFAULT_LOGGER.debug("hi #{env['count']} from #{Process.pid}")
+      [200, {}, "hi"]
+    end
+    
+    pid_before = run_a_request(app)
 
     Process.waitpid(pid_before)
     
-    per_proc_logs_dir = File.join(SCRATCH_DIR, "passenger")
+    per_proc_logs_dir = File.join(SCRATCH_DIR, "per_proc")
     FileUtils.mkdir_p(per_proc_logs_dir)
-    PassengerLogPerProc.enable("#{per_proc_logs_dir}/test")    
-    
-    pid_after1 = run_a_request(2)
-    pid_after2 = run_a_request(2)
+    middleware_instance = RackLoggingPerProc.new(app, "#{per_proc_logs_dir}/test")
+        
+    pid_after1 = run_a_request(middleware_instance, 2)
+    pid_after2 = run_a_request(middleware_instance, 2)
     
     Process.waitpid(pid_after1)
     Process.waitpid(pid_after2)
@@ -74,14 +74,14 @@ class TestPassengerLogPerProc < Test::Unit::TestCase
     # puts "proc1_file_contents log: \n" + proc1_file_contents
     proc1_log_lines = proc1_file_contents.split("\n").reject{|l| l.match(/RECEIVE_REQUEST/) || l.match(/RESPONSE_SENT/) }
 
-    assert_equal(["Passenger logging started", "hi 0 from #{pid_after1}", "", "hi 1 from #{pid_after1}"],
+    assert_equal(["Process logging started", "hi 0 from #{pid_after1}", "", "hi 1 from #{pid_after1}"],
         proc1_log_lines[1,5])
 
 
     # puts "proc2_file_contents log: \n" + proc2_file_contents
     proc2_log_lines = proc2_file_contents.split("\n").reject{|l| l.match(/RECEIVE_REQUEST/) || l.match(/RESPONSE_SENT/) }
 
-    assert_equal(["Passenger logging started", "hi 0 from #{pid_after2}", "", "hi 1 from #{pid_after2}"],
+    assert_equal(["Process logging started", "hi 0 from #{pid_after2}", "", "hi 1 from #{pid_after2}"],
         proc2_log_lines[1,5])
   end
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brontes3d-production_log_analyzer
 version: !ruby/object:Gem::Version 
-  version: "2009022403"
+  version: "2009072100"
 platform: ruby
 authors: 
 - Eric Hodel
@@ -61,8 +61,8 @@ files:
 - test/test_analyzer.rb
 - test/test_parser.rb
 - test/test_helper.rb
-- lib/passenger_log_per_proc.rb
-- test/test_passenger_log_per_proc.rb
+- lib/rack_logging_per_proc.rb
+- test/test_rack_logging_per_proc.rb
 - test/test_syslogs/test.syslog.0.14.x.log
 - test/test_syslogs/test.syslog.1.2.shortname.log
 - test/test_syslogs/test.syslog.empty.log

data/lib/passenger_log_per_proc.rb

@@ -1,55 +0,0 @@
-class PassengerLogPerProc
-  
-  cattr_accessor :log_path_prefix
-  
-  def self.logger_mutex
-   @@logger_mutex ||= Mutex.new
-  end
-  
-  # with log_path_with_prefix like {RAILS_ROOT}/log/passenger/{RAILS_ENV}
-  # you will get logs like {RAILS_ROOT}/log/passenger/{RAILS_ENV}_{Pid}.log
-  def self.enable(log_path_with_prefix)
-    PassengerLogPerProc.log_path_prefix = log_path_with_prefix
-    PhusionPassenger::Rack::RequestHandler.class_eval do
-      cattr_accessor :process_logger
-      
-      def process_request_with_extra_logging(env, input, output)
-        unless self.class.process_logger
-          PhusionPassenger::Rack::RequestHandler.process_logger = ActiveSupport::BufferedLogger.new(PassengerLogPerProc.log_path_prefix + "_#{Process.pid}" + ".log")
-
-          PhusionPassenger::Rack::RequestHandler.process_logger.debug("\nPassenger logging started")
-
-          RAILS_DEFAULT_LOGGER.instance_eval do
-            class << self
-              def add(severity, message = nil, progname = nil, &block)
-                to_return = super
-                if to_return
-                  Thread.current[:passenger_logs] ||= []
-                  Thread.current[:passenger_logs] << [severity, to_return.strip]
-                end
-                to_return
-              end
-            end
-          end          
-        end
-        
-        Thread.current[:passenger_logs] ||= []
-        start_time = Time.now
-        process_request_without_extra_logging(env, input, output)
-      ensure
-        PassengerLogPerProc.logger_mutex.synchronize do
-          PhusionPassenger::Rack::RequestHandler.process_logger.info("RECEIVE_REQUEST (#{Process.pid}) #{env['REQUEST_METHOD']} #{env['REQUEST_URI']} #{start_time}")        
-          Thread.current[:passenger_logs].each do |to_log|
-            PhusionPassenger::Rack::RequestHandler.process_logger.add(to_log[0], to_log[1])
-          end
-          PhusionPassenger::Rack::RequestHandler.process_logger.info("#{Time.now} (#{Process.pid}) RESPONSE_SENT")
-          PhusionPassenger::Rack::RequestHandler.process_logger.info("\n")
-          Thread.current[:passenger_logs] = []
-        end
-      end
-  
-      alias_method_chain :process_request, :extra_logging  
-    end    
-  end
-    
-end