oink 0.9.1 → 0.9.2

data/MIT-LICENSE

@@ -1,5 +1,4 @@
 Copyright (c) 2009 Noah Davis
-Copyright (c) 2008 Ben Johnson of Binary Logic (binarylogic.com)
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -32,23 +32,37 @@ Add oink to your Gemfile
 
 gem "oink"
 
-In most rails environments this is sufficient and oink will be required for you via bundler. If not, add a require statement "require 'oink'" in your app.
+In most rails environments this is sufficient and oink will be required for you via bundler.
+If not, add a require statement "require 'oink'" in your app.
 
 === Configuration
 
 Oink is middleware for instrumentation during the runtime of your application as well as log parsers for offline crunching of the logs generated by
 the middleware.
 
-The middleware class to include into your stack is "Oink::Middleware". In rails this can be included by adding the following to your
-application.rb or environment.rb file:
+The middleware class to include into your stack is "Oink::Middleware". For rails using an initializer is recommended:
 
-config.middleware.use "Oink::Middleware"
+  YourApplication::Application.middleware.use Oink::Middleware
 
-or in an initializer, you can also include it:
+Oink::Middleware writes log entries to log/oink.log in your application root directory by default.
 
-YouApplication::Application.middleware.use Oink::Middleware
+You can also initialize it with an optional logger instance enabling your application to write Oink log entries to your application's default log file:
 
-Note that the previous way of configuring oink, as a set of modules to include into rails controllers, is deprecated and is set to be removed shortly.
+  YourApplication::Application.middleware.use( Oink::Middleware, :logger => Rails.logger )
+
+(This setup enables Oink to work with Request Log Analyzer (https://github.com/wvanbergen/request-log-analyzer), which currently parses rails logs)
+
+Oink::Middleware logs memory and activerecord usage by default.
+
+You can configure which using the :instruments option. For memory only:
+
+  YourApplication::Application.middleware.use( Oink::Middleware, :instruments => :memory )
+
+For activerecord instantiation counts only:
+
+  YourApplication::Application.middleware.use( Oink::Middleware, :instruments => :activerecord )
+
+Note that the previous way of configuring oink, as a set of modules to include into rails controllers, is deprecated.
 
 == Analyzing logs
 
@@ -106,12 +120,15 @@ e.g. In verbose mode, oink will print out all the log information from your logs
   $ oink --format verbose --threshold=75 /tmp/logs/*
 
   ---------------------------------------------------------------------
+
   Feb 08 11:39:52 ey33-s00302 rails[9076]: Processing UsersController#show (for 11.187.34.45 at 2009-02-08 11:39:52) [GET]
   Feb 08 11:39:52 ey33-s00302 rails[9076]: Parameters: {"action"=>"show", "id"=>"45", "controller"=>"users"}
   Feb 08 11:39:52 ey33-s00302 rails[9076]: Rendering template within layouts/application
   Feb 08 11:39:52 ey33-s00302 rails[9076]: Rendering users/show
-  Feb 08 11:39:54 ey33-s00302 rails[9076]: Memory usage: 316516 | PID: 9076
   Feb 08 11:39:54 ey33-s00302 rails[9076]: Completed in 2008ms (View: 1136, DB: 264) | 200 OK [http://www.example.com/users/45]
+  Feb 08 11:39:52 ey33-s00302 rails[9076]: Oink Action: users#show
+  Feb 08 11:39:54 ey33-s00302 rails[9076]: Memory usage: 316516 | PID: 9076
+  Feb 08 11:39:54 ey33-s00302 rails[9076]: Oink Log Entry Complete
   ---------------------------------------------------------------------
 
 Verbose format prints the summary as well as each action which exceeded the threshold.

data/Rakefile

@@ -6,7 +6,7 @@ begin
   require 'jeweler'
   Jeweler::Tasks.new do |s|
     s.name         = "oink"
-    s.version      = "0.9.1"
+    s.version      = "0.9.2"
     s.author       = "Noah Davis"
     s.email        = "noahd1" + "@" + "yahoo.com"
     s.homepage     = "http://github.com/noahd1/oink"
@@ -14,7 +14,6 @@ begin
     s.description  = s.summary
     s.executables  = "oink"
     s.files        = %w[History.txt MIT-LICENSE README.rdoc Rakefile] + Dir["bin/*"] + Dir["lib/**/*"]
-    s.add_dependency 'hodel_3000_compliant_logger'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/lib/oink/middleware.rb

@@ -5,44 +5,57 @@ require 'oink/instrumentation'
 module Oink
   class Middleware
 
-    def initialize(app, logpath = "log/oink.log")
-      ActiveRecord::Base.send(:include, Oink::Instrumentation::ActiveRecord)
-      @logger = Hodel3000CompliantLogger.new(logpath)
-      @app = app
+    def initialize(app, options = {})
+      @app         = app
+      @logger      = options[:logger] || Hodel3000CompliantLogger.new("log/oink.log")
+      @instruments = options[:instruments] ? Array(options[:instruments]) : [:memory, :activerecord]
+
+      ActiveRecord::Base.send(:include, Oink::Instrumentation::ActiveRecord) if @instruments.include?(:activerecord)
     end
 
     def call(env)
       status, headers, body = @app.call(env)
-      log_routing_information(env)
-      @logger.info("Completed in")
-      log_memory_snapshot
-      log_objects_instantiated
-      reset_objects_instantiated
+
+      log_routing(env)
+      log_memory
+      log_activerecord
+      log_completed
       [status, headers, body]
     end
 
-    def log_routing_information(env)
+    def log_completed
+      @logger.info("Oink Log Entry Complete")
+    end
+
+    def log_routing(env)
       if env.has_key?('action_dispatch.request.parameters')
         controller = env['action_dispatch.request.parameters']['controller']
-        action = env['action_dispatch.request.parameters']['action']
-        @logger.info "Processing #{controller}##{action}"
+        action     = env['action_dispatch.request.parameters']['action']
+        @logger.info("Oink Action: #{controller}##{action}")
       end
     end
 
-    def log_memory_snapshot
-      memory = Oink::Instrumentation::MemorySnapshot.memory
-      @logger.info("Memory usage: #{memory} | PID: #{$$}")
+    def log_memory
+      if @instruments.include?(:memory)
+        memory = Oink::Instrumentation::MemorySnapshot.memory
+        @logger.info("Memory usage: #{memory} | PID: #{$$}")
+      end
     end
 
-    def log_objects_instantiated
-      sorted_list = Oink::HashUtils.to_sorted_array(ActiveRecord::Base.instantiated_hash)
-      sorted_list.unshift("Total: #{ActiveRecord::Base.total_objects_instantiated}")
-      @logger.info("Instantiation Breakdown: #{sorted_list.join(' | ')}")
+    def log_activerecord
+      if @instruments.include?(:activerecord)
+        sorted_list = Oink::HashUtils.to_sorted_array(ActiveRecord::Base.instantiated_hash)
+        sorted_list.unshift("Total: #{ActiveRecord::Base.total_objects_instantiated}")
+        @logger.info("Instantiation Breakdown: #{sorted_list.join(' | ')}")
+        reset_objects_instantiated
+      end
     end
 
+  private
+
     def reset_objects_instantiated
       ActiveRecord::Base.reset_instance_type_count
     end
 
   end
-end
+end

data/lib/oink/reports/active_record_instantiation_report.rb

@@ -26,7 +26,7 @@ module Oink
               @pids[pid][:buffer] << line
             end
 
-            if line =~ /Processing ((\w+)#(\w+)) /
+            if line =~ /Oink Action: ((\w+)#(\w+))/
 
               @pids[pid][:action] = $1
               unless @pids[pid][:request_finished]
@@ -38,7 +38,7 @@ module Oink
 
               @pids[pid][:ar_count] = $1.to_i
 
-            elsif line =~ /Completed in/
+            elsif line =~ /Oink Log Entry Complete/
 
               if @pids[pid][:ar_count] > @threshold
                 @bad_actions[@pids[pid][:action]] ||= 0

data/lib/oink/reports/memory_usage_report.rb

@@ -25,7 +25,7 @@ module Oink
               @pids[pid][:buffer] << line
             end
 
-            if line =~ /Processing ((\w+)#(\w+)) /
+            if line =~ /Oink Action: ((\w+)#(\w+))/
 
               unless @pids[pid][:request_finished]
                 @pids[pid][:last_memory_reading] = -1
@@ -38,7 +38,7 @@ module Oink
               memory_reading = $1.to_i
               @pids[pid][:current_memory_reading] = memory_reading
 
-            elsif line =~ /Completed in/
+            elsif line =~ /Oink Log Entry Complete/
 
               @pids[pid][:request_finished] = true
               unless @pids[pid][:current_memory_reading] == -1 || @pids[pid][:last_memory_reading] == -1

data/spec/oink/middleware_configuration_spec.rb

@@ -0,0 +1,65 @@
+require File.expand_path(File.dirname(__FILE__) + "/../spec_helper")
+require "oink/middleware"
+require 'rack/test'
+
+describe "Oink::Middleware configuration" do
+  include Rack::Test::Methods
+
+  class SampleApplication
+    def call(env)
+      [200, {}, ""]
+    end
+  end
+
+  let(:app)         { Oink::Middleware.new(SampleApplication.new, oink_configuration) }
+  let(:oink_configuration) { @oink_configuration || {} }
+
+  context "instruments options" do
+    before do
+      @log_output = StringIO.new
+      Hodel3000CompliantLogger.stub(:new => Hodel3000CompliantLogger.new(@log_output))
+      Oink::Instrumentation::MemorySnapshot.stub(:memory => 4092)
+    end
+
+    context "with the memory instrument specified" do
+      before do
+        @oink_configuration = { :instruments => :memory }
+      end
+
+      it "does log memory usage" do
+        get "/"
+        @log_output.string.should include("Memory usage: 4092 | PID: #{$$}")
+      end
+
+      it "does not log activerecord objects instantiated" do
+        get "/"
+        @log_output.string.should_not include("Instantiation Breakdown:")
+      end
+
+      it "does not monkeypatch activerecord" do
+        ActiveRecord::Base.should_not_receive(:include)
+        get "/"
+      end
+
+      it "does not call reset_instance_type_count" do
+        ActiveRecord::Base.should_not_receive(:reset_instance_type_count)
+        get "/"
+      end
+    end
+
+    context "with the activerecord instrument specified" do
+      before do
+        @oink_configuration = { :instruments => :activerecord }
+        get "/"
+      end
+
+      it "does not log memory usage" do
+        @log_output.string.should_not include("Memory usage:")
+      end
+
+      it "does log activerecord objects instantiated" do
+        @log_output.string.should include("Instantiation Breakdown:")
+      end
+    end
+  end
+end

data/spec/oink/middleware_spec.rb

@@ -21,53 +21,52 @@ describe Oink::Middleware do
     end
   end
 
-  let(:app)         { Oink::Middleware.new(SampleApplication.new) }
+  let(:log_output)  { StringIO.new }
+  let(:logger)      { Hodel3000CompliantLogger.new(log_output) }
+  let(:app)         { Oink::Middleware.new(SampleApplication.new, :logger => logger) }
 
   before do
-    @log_output = StringIO.new
-    Hodel3000CompliantLogger.stub(:new => Hodel3000CompliantLogger.new(@log_output))
     Oink::Instrumentation::MemorySnapshot.stub(:memory => 4092)
     Pig.delete_all
     Pen.delete_all
   end
 
-
   context "support legacy rails log format in transition to oink's own log format" do
     it "writes rails[pid] to the log even if the app isn't a rails app (for now)" do
       get "/no_pigs"
-      @log_output.string.should include("rails[#{$$}]")
+      log_output.string.should include("rails[#{$$}]")
     end
 
-    it "writes 'Completed in' after the request has completed" do
+    it "writes 'Oink Log Entry Complete' after the request has completed" do
       get "/no_pigs"
-      @log_output.string.should include("Completed in")
+      log_output.string.should include("Oink Log Entry Complete")
     end
 
     it "logs the action and controller" do
       get "/no_pigs", {}, {'action_dispatch.request.parameters' => {'controller' => 'oinkoink', 'action' => 'piggie'}}
-      @log_output.string.should include("Processing oinkoink#piggie")
+      log_output.string.should include("Oink Action: oinkoink#piggie")
     end
   end
 
   it "reports 0 totals" do
     get "/no_pigs"
-    @log_output.string.should include("Instantiation Breakdown: Total: 0")
+    log_output.string.should include("Instantiation Breakdown: Total: 0")
   end
 
   it "reports totals first even if it's a tie" do
     get "/two_pigs"
-    @log_output.string.should include("Instantiation Breakdown: Total: 2 | Pig: 2")
+    log_output.string.should include("Instantiation Breakdown: Total: 2 | Pig: 2")
   end
 
   it "reports pigs and pens instantiated" do
     get "/two_pigs_in_a_pen"
-    @log_output.string.should include("Instantiation Breakdown: Total: 3 | Pig: 2 | Pen: 1")
+    log_output.string.should include("Instantiation Breakdown: Total: 3 | Pig: 2 | Pen: 1")
   end
 
   it "logs memory usage" do
     Oink::Instrumentation::MemorySnapshot.should_receive(:memory).and_return(4092)
     get "/two_pigs_in_a_pen"
-    @log_output.string.should include("Memory usage: 4092 | PID: #{$$}")
+    log_output.string.should include("Memory usage: 4092 | PID: #{$$}")
   end
 
 end

data/spec/oink/reports/active_record_instantiation_report_spec.rb

@@ -7,9 +7,9 @@ module Oink::Reports
 
       it "should report actions which exceed the threshold once" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 51 | User: 51
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
@@ -20,9 +20,9 @@ module Oink::Reports
 
       it "should not report actions which do not exceed the threshold" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 50 | User: 50
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
@@ -33,12 +33,12 @@ module Oink::Reports
 
       it "should report actions which exceed the threshold multiple times" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 51 | User: 51
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 51 | User: 51
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
@@ -49,15 +49,15 @@ module Oink::Reports
 
       it "should order actions by most exceeded" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Media#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 51 | User: 51
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Media#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 51 | User: 51
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 51 | User: 51
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
@@ -69,13 +69,13 @@ module Oink::Reports
 
       it "should not be bothered by incomplete requests" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Media#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 24 | User: 24
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Media#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 51 | User: 51
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
@@ -90,9 +90,9 @@ module Oink::Reports
 
       it "should only report requests over threshold" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 51 | User: 51
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
@@ -103,9 +103,9 @@ module Oink::Reports
 
       it "should not include requests which are not over threshold" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 50 | User: 50
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
@@ -116,19 +116,19 @@ module Oink::Reports
 
       it "should order offenses from biggest to smallest" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing DetailsController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Details#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 75 | User: 75
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:32 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:32 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:33 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 100 | User: 100
-        Feb 01 01:58:34 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:34 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
         output = PsuedoOutput.new
         ActiveRecordInstantiationReport.new(io, 50).print(output)
-        output[4].should == "1. Feb 01 01:58:34, 100, MediaController#show"
-        output[5].should == "2. Feb 01 01:58:31, 75, DetailsController#show"
+        output[4].should == "1. Feb 01 01:58:34, 100, Media#show"
+        output[5].should == "2. Feb 01 01:58:31, 75, Details#show"
       end
 
     end
@@ -136,9 +136,9 @@ module Oink::Reports
     describe "verbose format" do
       it "should print the full lines of actions exceeding the threshold" do
         str = <<-STR
-        Feb 01 01:58:32 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:32 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:33 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 100 | User: 100
-        Feb 01 01:58:34 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:34 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
         io = StringIO.new(str)
         output = PsuedoOutput.new
@@ -148,13 +148,13 @@ module Oink::Reports
 
       it "should handle actions which do not complete properly" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Media#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 24 | User: 24
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Media#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 51 | User: 51
-        Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
@@ -168,22 +168,22 @@ module Oink::Reports
       it "should accept multiple files" do
 
         str1 = <<-STR
-        Feb 01 01:58:32 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:32 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:33 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 100 | User: 100
-        Feb 01 01:58:34 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:34 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         str2 = <<-STR
-        Feb 01 01:58:32 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:32 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:33 ey04-s00297 rails[4413]: Instantiation Breakdown: Total: 100 | User: 100
-        Feb 01 01:58:34 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:34 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io1 = StringIO.new(str1)
         io2 = StringIO.new(str2)
         output = PsuedoOutput.new
         ActiveRecordInstantiationReport.new([io1, io2], 50).print(output)
-        output.should include("2, MediaController#show")
+        output.should include("2, Media#show")
       end
 
     end

data/spec/oink/reports/memory_usage_report_spec.rb

@@ -9,77 +9,77 @@ module Oink::Reports
 
       it "should report actions which exceed the threshold once" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
         output = PsuedoOutput.new
         MemoryUsageReport.new(io, TEN_MEGS).print(output)
-        output.should include("1, MediaController#show")
+        output.should include("1, Media#show")
       end
 
       it "should not report actions which do not exceed the threshold" do
         threshold = 10
 
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
         output = PsuedoOutput.new
         MemoryUsageReport.new(io, TEN_MEGS).print(output)
-        output.should_not include("1, MediaController#show")
+        output.should_not include("1, Media#show")
       end
 
       it "should report actions which exceed the threshold multiple times" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{(TEN_MEGS * 2) + 2} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
         output = PsuedoOutput.new
         MemoryUsageReport.new(io, TEN_MEGS).print(output)
-        output.should include("2, MediaController#show")
+        output.should include("2, Media#show")
       end
 
       it "should order actions by most exceeded" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{(TEN_MEGS * 2) + 2} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{(TEN_MEGS * 3) + 3} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
         output = PsuedoOutput.new
         MemoryUsageReport.new(io, TEN_MEGS).print(output)
-        output[-2].should == "2, MediaController#show"
+        output[-2].should == "2, Media#show"
         output[-1].should == "1, Users#show"
       end
 
@@ -87,100 +87,100 @@ module Oink::Reports
         threshold = 10
 
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
         output = PsuedoOutput.new
         MemoryUsageReport.new(io, TEN_MEGS).print(output)
-        output.should_not include("1, MediaController#show")
+        output.should_not include("1, Media#show")
       end
 
       it "should not report actions from different pids" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[5513]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[5513]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[5513]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[5513]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[5513]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
         output = PsuedoOutput.new
         MemoryUsageReport.new(io, TEN_MEGS).print(output)
-        output.should_not include("1, MediaController#show")
+        output.should_not include("1, Media#show")
       end
 
       describe "summary with top 10 offenses" do
 
         it "should only report requests over threshold" do
           str = <<-STR
-          Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+          Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
           Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-          Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
-          Feb 01 01:58:32 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+          Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
+          Feb 01 01:58:32 ey04-s00297 rails[4413]: Oink Action: Media#show
           Feb 01 01:58:33 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-          Feb 01 01:58:34 ey04-s00297 rails[4413]: Completed in
+          Feb 01 01:58:34 ey04-s00297 rails[4413]: Oink Log Entry Complete
           STR
 
           io = StringIO.new(str)
           output = PsuedoOutput.new
           MemoryUsageReport.new(io, TEN_MEGS).print(output)
-          output.should include("1. Feb 01 01:58:34, #{TEN_MEGS + 1} KB, MediaController#show")
+          output.should include("1. Feb 01 01:58:34, #{TEN_MEGS + 1} KB, Media#show")
         end
 
         it "should not include requests which are not over the threshold" do
           str = <<-STR
-          Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+          Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
           Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-          Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
-          Feb 01 01:58:32 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+          Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
+          Feb 01 01:58:32 ey04-s00297 rails[4413]: Oink Action: Media#show
           Feb 01 01:58:33 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS} | PID: 4413
-          Feb 01 01:58:34 ey04-s00297 rails[4413]: Completed in
+          Feb 01 01:58:34 ey04-s00297 rails[4413]: Oink Log Entry Complete
           STR
 
           io = StringIO.new(str)
           output = PsuedoOutput.new
           MemoryUsageReport.new(io, TEN_MEGS).print(output)
-          output.should_not include("1. Feb 01 01:58:34, #{TEN_MEGS + 1} KB, MediaController#show")
+          output.should_not include("1. Feb 01 01:58:34, #{TEN_MEGS + 1} KB, Media#show")
         end
 
         it "should order offenses from biggest to smallest" do
           str = <<-STR
-          Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+          Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
           Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-          Feb 01 01:58:31 ey04-s00297 rails[4413]: Completed in
-          Feb 01 01:58:32 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+          Feb 01 01:58:31 ey04-s00297 rails[4413]: Oink Log Entry Complete
+          Feb 01 01:58:32 ey04-s00297 rails[4413]: Oink Action: Media#show
           Feb 01 01:58:33 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-          Feb 01 01:58:34 ey04-s00297 rails[4413]: Completed in
-          Feb 01 01:58:35 ey04-s00297 rails[4413]: Processing DetailsController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+          Feb 01 01:58:34 ey04-s00297 rails[4413]: Oink Log Entry Complete
+          Feb 01 01:58:35 ey04-s00297 rails[4413]: Oink Action: Details#show
           Feb 01 01:58:36 ey04-s00297 rails[4413]: Memory usage: #{(TEN_MEGS * 2) + 2} | PID: 4413
-          Feb 01 01:58:37 ey04-s00297 rails[4413]: Completed in
+          Feb 01 01:58:37 ey04-s00297 rails[4413]: Oink Log Entry Complete
           STR
 
           io = StringIO.new(str)
           output = PsuedoOutput.new
           MemoryUsageReport.new(io, TEN_MEGS).print(output)
-          output[4].should == "1. Feb 01 01:58:34, #{TEN_MEGS + 1} KB, MediaController#show"
-          output[5].should == "2. Feb 01 01:58:37, #{TEN_MEGS + 1} KB, DetailsController#show"
+          output[4].should == "1. Feb 01 01:58:34, #{TEN_MEGS + 1} KB, Media#show"
+          output[5].should == "2. Feb 01 01:58:37, #{TEN_MEGS + 1} KB, Details#show"
         end
 
       end
 
       # it "should report the time span" do
       #   str = <<-STR
-      #   Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+      #   Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
       #   Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-      #   Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-      #   Mar 13 01:58:29 ey04-s00297 rails[5513]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+      #   Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+      #   Mar 13 01:58:29 ey04-s00297 rails[5513]: Oink Action: Media#show
       #   Mar 13 01:58:30 ey04-s00297 rails[5513]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-      #   Mar 13 03:58:30 ey04-s00297 rails[5513]: Completed in
+      #   Mar 13 03:58:30 ey04-s00297 rails[5513]: Oink Log Entry Complete
       #   STR
       #
       #   io = StringIO.new(str)
@@ -196,14 +196,14 @@ module Oink::Reports
     describe "verbose format" do
       it "should print the full lines of actions exceeding the threshold" do
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:29 ey04-s00297 rails[4413]: Parameters: {"id"=>"2332", "controller"=>"users"}
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:29 ey04-s00297 rails[4413]: Parameters: {"id"=>"22900", "controller"=>"media"}
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
         io = StringIO.new(str)
         output = PsuedoOutput.new
@@ -215,15 +215,15 @@ module Oink::Reports
         threshold = 10
 
         str = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
         Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing ActorController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{(TEN_MEGS * 2) + 2} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io = StringIO.new(str)
@@ -237,28 +237,28 @@ module Oink::Reports
       it "should accept multiple files" do
 
         str1 = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         str2 = <<-STR
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing Users#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Users#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: 0 | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
-        Feb 01 01:58:29 ey04-s00297 rails[4413]: Processing MediaController#show (for 92.84.151.171 at 2009-02-01 01:58:29) [GET]
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
+        Feb 01 01:58:29 ey04-s00297 rails[4413]: Oink Action: Media#show
         Feb 01 01:58:30 ey04-s00297 rails[4413]: Memory usage: #{TEN_MEGS + 1} | PID: 4413
-        Feb 01 01:58:30 ey04-s00297 rails[4413]: Completed in
+        Feb 01 01:58:30 ey04-s00297 rails[4413]: Oink Log Entry Complete
         STR
 
         io1 = StringIO.new(str1)
         io2 = StringIO.new(str2)
         output = PsuedoOutput.new
         MemoryUsageReport.new([io1, io2], TEN_MEGS).print(output)
-        output.should include("2, MediaController#show")
+        output.should include("2, Media#show")
       end
 
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: oink
 version: !ruby/object:Gem::Version 
-  hash: 57
+  hash: 63
   prerelease: 
   segments: 
   - 0
   - 9
-  - 1
-  version: 0.9.1
+  - 2
+  version: 0.9.2
 platform: ruby
 authors: 
 - Noah Davis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -04:00
+date: 2011-04-05 00:00:00 -04:00
 default_executable: oink
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -130,20 +130,6 @@ dependencies:
   requirement: *id008
   prerelease: false
   name: ruby-debug
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
-  prerelease: false
-  name: hodel_3000_compliant_logger
 description: Log parser to identify actions which significantly increase VM heap size
 email: noahd1@yahoo.com
 executables: 
@@ -180,6 +166,7 @@ files:
 - spec/helpers/database.rb
 - spec/oink/instrumentation/instance_type_counter_spec.rb
 - spec/oink/instrumentation/memory_snapshot_spec.rb
+- spec/oink/middleware_configuration_spec.rb
 - spec/oink/middleware_spec.rb
 - spec/oink/rails/instance_type_counter_spec.rb
 - spec/oink/rails/memory_usage_logger_spec.rb
@@ -228,6 +215,7 @@ test_files:
 - spec/helpers/database.rb
 - spec/oink/instrumentation/instance_type_counter_spec.rb
 - spec/oink/instrumentation/memory_snapshot_spec.rb
+- spec/oink/middleware_configuration_spec.rb
 - spec/oink/middleware_spec.rb
 - spec/oink/rails/instance_type_counter_spec.rb
 - spec/oink/rails/memory_usage_logger_spec.rb