[Jifty-commit] r6818 - in jifty/trunk/lib/Jifty/Plugin: .

[Jifty commits]

Author: sartak
Date: Wed Apr 22 04:05:41 2009
New Revision: 6818

Removed:
   jifty/trunk/lib/Jifty/Plugin/SQLQueries/Dispatcher.pm
   jifty/trunk/lib/Jifty/Plugin/SQLQueries/View.pm
Modified:
   jifty/trunk/lib/Jifty/Plugin/SQLQueries.pm

Log:
Reimplement SQLQueries as a RequestInspector consumer

Modified: jifty/trunk/lib/Jifty/Plugin/SQLQueries.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/SQLQueries.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/SQLQueries.pm	Wed Apr 22 04:05:41 2009
@@ -1,53 +1,7 @@
-#!/usr/bin/env perl
 package Jifty::Plugin::SQLQueries;
-use base qw/Jifty::Plugin/;
 use strict;
 use warnings;
-
-our @requests;
-our @slow_queries;
-our @halo_queries;
-
-=head1 NAME
-
-Jifty::Plugin::SQLQueries - SQL query logging and reporting for your Jifty app
-
-=head1 DESCRIPTION
-
-SQL query logging and reporting for your Jifty app.  Use this plugin
-if you wish to profile or analyze the database queries Jifty is
-running for individual page loads.
-
-=head1 USAGE
-
-Add the following to your site_config.yml
-
- framework:
-   Plugins:
-     - SQLQueries: {}
-
-This makes the following URLs available:
-
-View the top-level query report (how many queries each request had)
-
-    http://your.app/__jifty/admin/queries
-
-View the top-level query report, including zero-query requests
-
-    http://your.app/__jifty/admin/queries/all
-
-View an individual request's detailed query report (which queries were made,
-where, how long they took, etc)
-
-    http://your.app/__jifty/admin/queries/3
-
-=head2 METHODS
-
-=head2 init
-
-This makes sure that each request is wrapped with query logging.
-
-=cut
+use base 'Jifty::Plugin';
 
 sub init {
     my $self = shift;
@@ -56,23 +10,8 @@
     Jifty->add_trigger(
         post_init => \&post_init
     );
-
-    Jifty::Handler->add_trigger(
-        before_request => \&before_request
-    );
-
-    Jifty::Handler->add_trigger(
-        after_request  => \&after_request
-    );
 }
 
-=head2 post_init
-
-This sets up L<Jifty::DBI>'s query logging, and is called at the end of
-C<< Jifty->new >>
-
-=cut
-
 sub post_init {
     Jifty->handle or return;
 
@@ -91,144 +30,20 @@
     });
 }
 
-=head2 before_request
-
-Clears the SQL log so you only get the request's queries
-
-=cut
-
-sub before_request {
-    Jifty->handle or return;
-}
-
-=head2 after_request
-
-Logs the queries made (at level DEBUG)
-
-=cut
-
-sub after_request {
-    Jifty->handle or return;
-
-    my $handler = shift;
-    my $cgi = shift;
-
-    my $total_time = 0;
-    my @log = ((splice @halo_queries), Jifty->handle->sql_statement_log());
-    Jifty->handle->clear_sql_statement_log();
-
-    for (@log) {
-        my ($time, $statement, $bindings, $duration, $results) = @$_;
-
-        $total_time += $duration;
-
-        # keep track of the ten slowest queries so far
-        if (@slow_queries < 10 || $duration > $slow_queries[0][3]) {
-            push @slow_queries, $_;
-            @slow_queries = sort { $a->[3] <=> $b->[3] } @slow_queries;
-            shift @slow_queries if @slow_queries > 9;
-        }
-    }
-
-    push @requests, {
-        id => 1 + @requests,
-        duration => $total_time,
-        url => $cgi->url(-absolute=>1,-path_info=>1),
-        time => scalar gmtime,
-        queries => \@log,
-    };
-}
-
-=head2 halo_pre_template
-
-Log any queries made to the previous template. Also, keep track of whatever
-queries made so the rest of the plugin can see them (since we clear the log)
-
-=cut
-
-sub halo_pre_template {
-    my $self = shift;
-    my $halo = shift;
-    my %args = @_;
-
-    push @{ $args{previous}{sql_statements} }, Jifty->handle->sql_statement_log;
-    push @halo_queries, Jifty->handle->sql_statement_log;
-
+sub inspect_before_request {
     Jifty->handle->clear_sql_statement_log;
-
-    $args{frame}{displays}{Q} = {
-        name => "queries",
-        callback => sub {
-            my $frame = shift;
-            my @queries;
-
-            for (@{ $frame->{sql_statements} || [] }) {
-                my $bindings;
-
-                if (@{$_->[2]}) {
-                    my @bindings = map {
-                        defined $_
-                            ? $_ =~ /[^[:space:][:graph:]]/
-                                ? "*BLOB*"
-                                : Jifty->web->escape($_)
-                            : "undef"
-                    } @{$_->[2]};
-
-                    $bindings = join '',
-                        "<b>",
-                        _('Bindings'),
-                        ":</b> <tt>",
-                        join(', ', @bindings),
-                        "</tt><br />",
-                }
-
-                push @queries, join "\n",
-                    qq{<span class="fixed">},
-                    Jifty->web->escape($_->[1]),
-                    qq{</span><br />},
-                    defined($bindings) ? $bindings : '',
-                    "<i>". _('%1 seconds', $_->[3]) ."</i>",
-            }
-
-            return undef if @queries == 0;
-
-            return "<ol>"
-                 . join("\n",
-                        map { "<li>$_</li>" }
-                        @queries)
-                 . "</ol>";
-        },
-    };
 }
 
-=head2 halo_post_template
-
-Log any queries made to the current template. Also, keep track of whatever
-queries made so the rest of the plugin can see them (since we clear the log)
-
-XXX: can this somehow be refactored into one function? If the same pattern
-occurs elsewhere I'll look into it.
-
-=cut
+sub inspect_after_request {
+    return [ Jifty->handle->sql_statement_log ];
+}
 
-sub halo_post_template {
+sub inspect_render_summary {
     my $self = shift;
-    my $halo = shift;
-    my %args = @_;
-
-    push @{ $args{frame}{sql_statements} }, Jifty->handle->sql_statement_log;
-    push @halo_queries, Jifty->handle->sql_statement_log;
+    my $log = shift;
 
-    Jifty->handle->clear_sql_statement_log;
+    return scalar @$log . ' queries';
 }
 
-=head1 COPYRIGHT AND LICENSE
-
-Copyright 2007 Best Practical Solutions
-
-This is free software and may be modified and distributed under the same terms as Perl itself.
-
-=cut
-
 1;