[Jifty-commit] r4652 - in jifty/trunk: lib/Jifty/Plugin/LeakTracker lib/Jifty/Plugin/SQLQueries

jifty-commit at lists.jifty.org jifty-commit at lists.jifty.org
Fri Dec 7 23:03:54 EST 2007


Author: sartak
Date: Fri Dec  7 23:03:54 2007
New Revision: 4652

Modified:
   jifty/trunk/   (props changed)
   jifty/trunk/lib/Jifty/Plugin/LeakTracker/View.pm
   jifty/trunk/lib/Jifty/Plugin/SQLQueries/View.pm

Log:
 r48790 at onn:  sartak | 2007-12-07 23:03:39 -0500
 Punt the design issue by making SQLQueries and LeakTracker use your app's layout :)


Modified: jifty/trunk/lib/Jifty/Plugin/LeakTracker/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/LeakTracker/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/LeakTracker/View.pm	Fri Dec  7 23:03:54 2007
@@ -13,79 +13,71 @@
 
 =cut
 
-template '/__jifty/admin/leaks/all' => sub {
+template '/__jifty/admin/leaks/all' => page {
     my $skip_zero = get 'skip_zero';
 
-    html {
-        body {
-            h1 { "Leaked Objects" }
-            p {
-                if ($skip_zero) {
-                    a { attr { href => "/__jifty/admin/leaks/all" }
-                        "Show zero-leak requests" }
-                }
-                else {
-                    a { attr { href => "/__jifty/admin/leaks" }
-                        "Hide zero-leak requests" }
-                }
-            }
-            hr {}
-
-            table {
-                row {
-                    th { "ID" }
-                    th { "Leaks" }
-                    th { "Bytes leaked" }
-                    th { "Time" }
-                    th { "URL" }
-                };
-
-                for (@Jifty::Plugin::LeakTracker::requests)
-                {
-                    next if $skip_zero && @{$_->{leaks}} == 0;
-
-                    row {
-                        cell { a {
-                            attr { href => "/__jifty/admin/leaks/$_->{id}" }
-                            $_->{id} } }
-
-                        cell { scalar @{$_->{leaks}} }
-                        cell { $_->{size} }
-                        cell { $_->{time} }
-                        cell { $_->{url} }
-                    };
-                }
-            }
+    h1 { "Leaked Objects" }
+    p {
+        if ($skip_zero) {
+            a { attr { href => "/__jifty/admin/leaks/all" }
+                "Show zero-leak requests" }
+        }
+        else {
+            a { attr { href => "/__jifty/admin/leaks" }
+                "Hide zero-leak requests" }
+        }
+    }
+    hr {}
+
+    table {
+        row {
+            th { "ID" }
+            th { "Leaks" }
+            th { "Bytes leaked" }
+            th { "Time" }
+            th { "URL" }
+        };
+
+        for (@Jifty::Plugin::LeakTracker::requests)
+        {
+            next if $skip_zero && @{$_->{leaks}} == 0;
+
+            row {
+                cell { a {
+                    attr { href => "/__jifty/admin/leaks/$_->{id}" }
+                    $_->{id} } }
+
+                cell { scalar @{$_->{leaks}} }
+                cell { $_->{size} }
+                cell { $_->{time} }
+                cell { $_->{url} }
+            };
         }
     }
 };
 
-template '/__jifty/admin/leaks/one' => sub {
+template '/__jifty/admin/leaks/one' => page {
     my $leak = get 'leak';
 
-    html {
-        body {
-            h1 { "Leaks from Request $leak->{id}" }
-            ul {
-                li { "URL: $leak->{url}" }
-                li { "Time: $leak->{time}" }
-                li { "Objects leaked: " . scalar(@{$leak->{leaks}}) }
-                li { "Total memory leaked: $leak->{size} bytes" }
-            }
-            p { a { attr { href => "/__jifty/admin/leaks" } "Table of Contents" } }
-            hr {}
-            h2 { "Object types leaked:" }
-            ul {
-                my %seen;
-                for (map { blessed $_ } @{ $leak->{leaks} }) {
-                    next if $seen{$_}++;
-                    li { $_ }
-                }
-            }
-            hr {}
-            pre { $leak->{objects} }
+    h1 { "Leaks from Request $leak->{id}" }
+    ul {
+        li { "URL: $leak->{url}" }
+        li { "Time: $leak->{time}" }
+        li { "Objects leaked: " . scalar(@{$leak->{leaks}}) }
+        li { "Total memory leaked: $leak->{size} bytes" }
+    }
+    p { a { attr { href => "/__jifty/admin/leaks" } "Table of Contents" } }
+    hr {}
+    h2 { "Object types leaked:" }
+    ul {
+        my %seen;
+        for (map { blessed $_ } @{ $leak->{leaks} }) {
+            next if $seen{$_}++;
+            li { $_ }
         }
     }
+    hr {}
+    pre { $leak->{objects} }
 };
 
 =head1 SEE ALSO

Modified: jifty/trunk/lib/Jifty/Plugin/SQLQueries/View.pm
==============================================================================
--- jifty/trunk/lib/Jifty/Plugin/SQLQueries/View.pm	(original)
+++ jifty/trunk/lib/Jifty/Plugin/SQLQueries/View.pm	Fri Dec  7 23:03:54 2007
@@ -13,94 +13,86 @@
 
 =cut
 
-template '/__jifty/admin/queries/all' => sub {
+template '/__jifty/admin/queries/all' => page {
     my $skip_zero = get 'skip_zero';
 
-    html {
-        body {
-            h1 { "Queries" }
-            p {
-                if ($skip_zero) {
-                    a { attr { href => "/__jifty/admin/queries/all" }
-                        "Show zero-query requests" }
-                }
-                else {
-                    a { attr { href => "/__jifty/admin/queries" }
-                        "Hide zero-query requests" }
-                }
-                a { attr { href => "/__jifty/admin/queries/clear" }
-                    "Clear query log" }
-            }
-            hr {}
-
-            h3 { "Slowest queries" };
-            table {
-                row {
-                    th { "Time taken" };
-                    th { "Query" };
-                };
-
-                for (reverse @Jifty::Plugin::SQLQueries::slow_queries)
-                {
-                    my ($time, $statement, $bindings, $duration, $misc) = @$_;
-                    row {
-                        cell { $duration };
-                        cell { $statement };
-                    };
-                }
+    h1 { "Queries" }
+    p {
+        if ($skip_zero) {
+            a { attr { href => "/__jifty/admin/queries/all" }
+                "Show zero-query requests" }
+        }
+        else {
+            a { attr { href => "/__jifty/admin/queries" }
+                "Hide zero-query requests" }
+        }
+        a { attr { href => "/__jifty/admin/queries/clear" }
+            "Clear query log" }
+    }
+    hr {}
+
+    h3 { "Slowest queries" };
+    table {
+        row {
+            th { "Time taken" };
+            th { "Query" };
+        };
+
+        for (reverse @Jifty::Plugin::SQLQueries::slow_queries)
+        {
+            my ($time, $statement, $bindings, $duration, $misc) = @$_;
+            row {
+                cell { $duration };
+                cell { $statement };
             };
+        }
+    };
 
-            hr {};
+    hr {};
 
-            h3 { "All queries" };
-            table {
-                row {
-                    th { "ID" }
-                    th { "Queries" }
-                    th { "Time taken" }
-                    th { "URL" }
-                };
-
-                for (@Jifty::Plugin::SQLQueries::requests)
-                {
-                    next if $skip_zero && @{ $_->{queries} } == 0;
-
-                    row {
-                        cell { a {
-                            attr { href => "/__jifty/admin/queries/$_->{id}" }
-                            $_->{id} } }
-
-                        cell { scalar @{ $_->{queries} } }
-                        cell { $_->{duration} }
-                        cell { $_->{url} }
-                    };
-                }
-            }
+    h3 { "All queries" };
+    table {
+        row {
+            th { "ID" }
+            th { "Queries" }
+            th { "Time taken" }
+            th { "URL" }
+        };
+
+        for (@Jifty::Plugin::SQLQueries::requests)
+        {
+            next if $skip_zero && @{ $_->{queries} } == 0;
+
+            row {
+                cell { a {
+                    attr { href => "/__jifty/admin/queries/$_->{id}" }
+                    $_->{id} } }
+
+                cell { scalar @{ $_->{queries} } }
+                cell { $_->{duration} }
+                cell { $_->{url} }
+            };
         }
     }
 };
 
-template '/__jifty/admin/queries/one' => sub {
+template '/__jifty/admin/queries/one' => page {
     my $query = get 'query';
 
-    html {
-        body {
-            h1 { "Queries from Request $query->{id}" }
-            ul {
-                li { "URL: $query->{url}" }
-                li { "At: " . $query->{time} }
-                li { "Time taken: $query->{duration}" }
-                li { "Queries made: " . @{ $query->{queries} } }
-            }
-            p { a { attr { href => "/__jifty/admin/queries" }
-                    "Table of Contents" } };
-
-            for ( @{ $query->{queries} } ) {
-                hr {};
-                set query => $_;
-                show '/__jifty/admin/queries/query';
-            }
-        }
+    h1 { "Queries from Request $query->{id}" }
+    ul {
+        li { "URL: $query->{url}" }
+        li { "At: " . $query->{time} }
+        li { "Time taken: $query->{duration}" }
+        li { "Queries made: " . @{ $query->{queries} } }
+    }
+    p { a { attr { href => "/__jifty/admin/queries" }
+            "Table of Contents" } };
+
+    for ( @{ $query->{queries} } ) {
+        hr {};
+        set query => $_;
+        show '/__jifty/admin/queries/query';
     }
 };
 


More information about the Jifty-commit mailing list