Changeset 119

Timestamp:

04/24/07 22:33:58 (3 years ago)

Author:

eevee

Message:

Fixed some caching problems, mostly revolving around COMPILE_DIR applying to the cached templates.

Location:

veekun/trunk

Files:

• lib/Vee/Controller/Root.pm (modified) (4 diffs)
• templates/wrapper.tt (modified) (1 diff)

veekun/trunk/lib/Vee/Controller/Root.pm

@@ -97 +97 @@
 
     # capture flagrant errors in prod
-    if (!$c->debug and scalar @{ $c->error }) {
+    if (not $c->debug and scalar @{ $c->error }) {
         eval {
             $c->model('DBIC::ErrorLog')->create({
@@ -156 +156 @@
     }
 
-    # if _cache holds a path, grab the output manually and cache it to disk
+    # if _cache_fh is set, grab the output manually and cache it to disk
     # NOTE: THIS EXPECTS THAT A WRAPPER IS USED
-    if ($s->{_cache}) {
-        open my $cache_file, '>', $c->path_to( 'tmp', 'cache', $s->{_cache} );
-
-        # HAY: print meta to cache here
-
+    if ($s->{_cache_fh}) {
         # disable wrapper, then get just the body
         my $skip_wrapper = $s->{skip_wrapper};
@@ -169 +165 @@
 
         # cache
+        my $cache_file = $s->{_cache_fh};
         print $cache_file $body;
+        flock $cache_file, 8;
         close $cache_file;
 
-        # let the RenderView render the newly-made cached file
         $s->{skip_wrapper} = $skip_wrapper;
-        $s->{template} = $s->{_cache};
-        push @{$s->{additional_template_paths}}, $c->path_to(qw/ tmp cache /);
+        $c->forward('/render_from_cache');
+
+    # this is done here so the above querylog/etc code can run first
+    } elsif ($s->{from_cache}) {
+        $c->forward('/render_from_cache');
     }
 }
@@ -191 +191 @@
     my $s = $c->stash;
 
+#    return if $c->debug;
+    return if not $s->{template};
+
     $key = '' if not defined $key;
     $key =~ tr/-_a-zA-Z0-9//cd;
     $key = 'default' if not length $key;
 
-    return if not $s->{template};
-
-    my $cache_path = $c->path_to( 'tmp', 'cache', $s->{template}, $key );
+    $s->{_cache_file} = "$s->{template}/$key";
+    my $cache_path = $c->path_to(qw/ tmp cache /) . '/' . $s->{_cache_file};
 
     if (-e $cache_path) {
-        # if the cache file exists, spit it out
-        $s->{template} = "$s->{template}/$key";
+        # if the cache file exists, flag end() to spit it out
         $s->{from_cache} = 1;
-        push @{$s->{additional_template_paths}}, $c->path_to(qw/ tmp cache /);
-
-        # ...then skip the rest of the calling controller
-        # TODO: should we treat the cache as flat text, read it ourselves..?
-        $c->detach('/null');
+        $c->detach;
     } else {
         # create directory tree; if there be a problem, just don't cache
-        eval { mkpath( $c->path_to(qw/ tmp cache /) . "/$s->{template}" ) };
+        eval { mkpath( $c->path_to(qw/ tmp cache /) . '/' . $s->{template} ) };
         return if $@;
 
-        $s->{_cache} = "$s->{template}/$key";
-    }
-}
-
-=head2 null
-
-Does nothing.  Used as an endpoint for /cache.  Probably a better way to do
-this.
-
-=cut
-
-sub null : Private { ; }
+        # open here and flock to prevent race condition
+        open my $cache_file, '>', $c->path_to(qw/ tmp cache /) . '/' . $s->{_cache_file};
+        flock $cache_file, 2;
+        $s->{_cache_fh} = $cache_file;
+    }
+}
+
+=head2 render_from_cache
+
+Used to...  render a template from the cache.  Mostly used as a hack to avoid
+template compilation, but I'd also like to figure out how to get TT to simply
+not parse the cached file at all.
+
+=cut
+
+sub render_from_cache : Private {
+    my ($self, $c) = @_;
+    my $s = $c->stash;
+
+    open my $cache_file, '<', $c->path_to(qw/ tmp cache /, $s->{_cache_file} );
+    $c->res->body( $c->view->render($c, $cache_file) );
+    close $cache_file;
+}
 
 =head1 AUTHOR

veekun/trunk/templates/wrapper.tt

@@ -143 +143 @@
     All content copyright its original owners.  Pok&eacute;mon is copyright to Nintendo and Game Freak.  Current site layout by Eevee/Alex Munroe and is &copy;2005. <br/>
 [% IF from_cache %]
-    This page was retrieved from cache by a team of <a href="[% uri('Dex', 'pokemon', 'scyther') %]">Scyther</a> jonin in about [% time_delta = time - start_time; time_delta | format('%0.6f') %] seconds. <br/>
+    This page was retrieved from cache by a team of <a href="[% uri('Dex', 'pokemon', 'scyther') %]">Scyther</a> jounin in about [% time_delta = time - start_time; time_delta | format('%0.6f') %] seconds. <br/>
 [% ELSE %]
     This page was created by a team of trained <a href="[% uri('Dex', 'pokemon', 'ambipom') %]">Ambipom</a> in about [% time_delta = time - start_time; time_delta | format('%0.6f') %] seconds. <br/>