Changeset 922 for plugins/staticcache/trunk/staticcache.plugin.php

Timestamp:

09/12/08 19:58:18 (4 months ago)

Author:

MattRead

Message:

plugin:staticcache NOTE: This update changes the basic structure of the
cache store. Please delete the cache or you will probably get errors.
There should a button to invalidate staticcaches cache, but there isn't
yet. If you want, please add one :).

Changing cache structure to include the caching of
headers to help prevent improper caching on redirects. Unfortunately we
still cannot grab the status header, so it will send 200, or 302 for
redirects. Also adding 404 detection, via the "matched rule", to ensure
that 404 response will not be cached and served as 200.

There is also now some basic hits/misses stats to show the percentage of
requests that are served cached pages (hits), and percentage that are
not (misses).

Files:

• plugins/staticcache/trunk/staticcache.plugin.php (modified) (7 diffs)

plugins/staticcache/trunk/staticcache.plugin.php

@@ -46 +46 @@
             if ( isset( $cache[$query_id] ) ) {
                 global $profile_start;
-                echo $cache[$query_id];
+                
+                foreach( $cache[$query_id]['headers'] as $header ) {
+                    header($header);
+                }
+                echo $cache[$query_id]['body'];
                 $time = microtime(true) - $profile_start;
                 echo "<!-- Served by StaticCache in $time seconds -->";
@@ -53 +57 @@
                     ( Options::get('staticcache__average_time') + $time ) / 2
                 );
+                Options::set('staticcache__hits', Options::get('staticcache__hits') + 1);
                 exit;
             }
         }
+        Options::set('staticcache__misses', Options::get('staticcache__misses') + 1);
         ob_start( 'StaticCache_ob_end_flush' );
     }
@@ -68 +74 @@
     public function filter_dash_module_static_cache( $module, $id, $theme )
     {
-        $theme->static_cache_average = sprintf( '%0.4f', Options::get('staticcache__average_time') );
+        $theme->static_cache_average = sprintf( '%.4f', Options::get('staticcache__average_time') );
         $theme->static_cache_pages = count( Cache::get_group('staticcache') );
+        
+        $hits = Options::get('staticcache__hits');
+        $misses = Options::get('staticcache__misses');
+        $total = $hits + $misses;
+        $theme->static_cache_hits = sprintf('%.0f', $total > 0 ? ($hits/$total)*100 : 0);
+        $theme->static_cache_misses = sprintf('%.0f', $total > 0 ? ($misses/$total)*100 : 0);
+        
         $module['content'] = $theme->fetch( 'static_cache_stats' );
         return $module;
@@ -133 +146 @@
     }
     
+    /**
+     * @todo add expire time option
+     * @todo add invalidate cache button
+     */
     public function action_plugin_ui( $plugin_id, $action )
     {
@@ -158 +175 @@
     public static function get_query_id()
     {
-        return crc32( parse_url( $_SERVER['REQUEST_URI'], PHP_URL_QUERY ) );
+        return crc32( parse_url($_SERVER['REQUEST_URI'], PHP_URL_QUERY) );
     }
     
@@ -168 +185 @@
         }
         if ( ! $url ) {
-            $url = Site::get_url( 'host' ) . rtrim( parse_url( $_SERVER['REQUEST_URI'], PHP_URL_PATH ), '/' );
+            $url = Site::get_url( 'host' ) . rtrim( parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH), '/' );
         }
         return crc32( $user_id . $url );
@@ -176 +193 @@
 function StaticCache_ob_end_flush( $buffer )
 {
+    // prevent caching of 404 responses
+    if ( !URL::get_matched_rule() || URL::get_matched_rule()->name == 'display_404' ) {
+        return false;
+    }
     $request_id = StaticCache::get_request_id();
     $query_id = StaticCache::get_query_id();
     
-    if ( Cache::has( array("staticcache", $request_id) ) ) {
-        $cache = Cache::get( array("staticcache", $request_id) );
-        $cache[$query_id] = $buffer;
-    }
-    else {
-        $cache = array( $query_id => $buffer );
-    }
+    $cache = array( $query_id => array(
+        'headers' => headers_list(),
+        'body' => $buffer
+        ));
     Cache::set( array("staticcache", $request_id), $cache );