fixed render_later to prevent delayed rendering warning

mojolicious · May 11, 2011 · 56f8a16 · 56f8a16
1 parent 3889e29
commit 56f8a16
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/Changes b/Changes
@@ -11,6 +11,7 @@ This file documents the revision history for Perl extension Mojolicious.
         - Improved documentation.
         - Fixed enabling of Perl 5.10 features in Mojo::Base and
           Mojolicious::Lite. (garu, sri)
+        - Fixed render_later to prevent delayed rendering warning.
 
 1.31    2011-05-08 00:00:00
         - Reverted deprecation of Perl 5.8.x support, by popular demand.

diff --git a/lib/Mojo/Server.pm b/lib/Mojo/Server.pm
@@ -23,14 +23,7 @@ has on_request => sub {
   sub {
     my $app = shift->app;
     my $tx  = shift;
-
-    # Handle transaction
     $app->handler($tx);
-
-    # Delayed
-    $app->log->debug(
-      'Waiting for delayed response, forgot to render or resume?')
-      unless $tx->is_writing;
   };
 };
 has on_transaction => sub {

diff --git a/lib/Mojolicious.pm b/lib/Mojolicious.pm
@@ -205,6 +205,11 @@ sub handler {
     $tx->res->code(500);
     $tx->resume;
   }
+
+  # Delayed
+  $self->log->debug(
+    'Waiting for delayed response, forgot to render or resume?')
+    unless $stash->{'mojo.rendered'} || $tx->is_writing;
 }
 
 # "This snow is beautiful. I'm glad global warming never happened.