[Jifty-commit] r6816 - jifty/trunk/lib/Jifty/Plugin

[Jifty commits]

Author: sartak
Date: Wed Apr 22 04:05:35 2009
New Revision: 6816

Modified:
   jifty/trunk/lib/Jifty/Plugin/RequestInspector.pm

Log:
inspect_after_request returns the new plugin_data, cleanup

Modified: jifty/trunk/lib/Jifty/Plugin/RequestInspector.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/RequestInspector.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/RequestInspector.pm	Wed Apr 22 04:05:35 2009
@@ -1,7 +1,7 @@
 package Jifty::Plugin::RequestInspector;
-use base qw/Jifty::Plugin/;
 use strict;
 use warnings;
+use base 'Jifty::Plugin';
 use Time::HiRes 'time';
 
 my $current_inspection;
@@ -57,7 +57,7 @@
     for my $plugin ($self->inspector_plugins) {
         next unless $plugin->can('inspect_before_request');
         my $plugin_data = $plugin->inspect_before_request($cgi);
-        $current_inspection->{plugin_data}{$plugin->name} = $plugin_data;
+        $current_inspection->{plugin_data}{ref $plugin} = $plugin_data;
     }
 }
 
@@ -67,8 +67,11 @@
     if ($current_inspection) {
         for my $plugin ($self->inspector_plugins) {
             next unless $plugin->can('inspect_after_request');
-            my $plugin_data = $current_inspection->{plugin_data}{$plugin->name};
-            $plugin->inspect_after_request($plugin_data, $cgi);
+            my $plugin_data = $current_inspection->{plugin_data}{ref $plugin};
+            my $new_plugin_data = $plugin->inspect_after_request($plugin_data, $cgi);
+            if (defined($new_plugin_data)) {
+                $current_inspection->{plugin_data}{ref $plugin} = $new_plugin_data;
+            }
         }
         $current_inspection->{end} = time;
         push @requests, $current_inspection;