Changeset 32445 in spip-zone

Timestamp:

Oct 28, 2009, 10:34:26 PM (11 years ago)

Author:

fil@…

Message:

gerer toutes les invalidations : par changement d'une meta, ou par var_mode=calcul

Location:

_plugins_/fastcache

Files:

• creer_fastcache.php (modified) (2 diffs)
• fastcache.php (modified) (1 diff)
• fastcache_options.php (modified) (2 diffs)

_plugins_/fastcache/creer_fastcache.php

@@ -20 +20 @@
         $dir_tmp = var_export(_DIR_TMP, true);
 
-        if (!$cache = $cfg['cache'])
-                $cache = _DIR_CACHE;
-        $cache = var_export($cache, true);
-
         $meta = var_export(_FILE_META, true);
         $prefix = var_export($GLOBALS['cookie_prefix'], true);
@@ -38 +34 @@
 @define ('_DIR_PLUGIN_FASTCACHE', $dir_plugin_fastcache);
 @define ('_DIR_TMP', $dir_tmp);
-@define ('_FC_DIR_CACHE', $cache);
 @define ('_FC_META', $meta);
 @define ('_FC_IE_PNGHACK', $pnghack);

_plugins_/fastcache/fastcache.php

@@ -32 +32 @@
 
 if (defined('_FC_KEY')
-AND $p = cache_get(_FC_KEY)) {
+AND $p = cache_get(_FC_KEY)
+AND $p['time'] == @filemtime(_FC_META)
+) {
         eval($p['head']);
         $b = (!is_null($p['ie']) AND fc_testie()) ? 'ie' : 'body';

_plugins_/fastcache/fastcache_options.php

@@ -57 +57 @@
                                                 .(_FC_DEBUG?"\n<!-- read "._FC_KEY." -->\n":''),
                                         'ie' => $ie
-                                                .(_FC_DEBUG?"\n<!-- read "._FC_KEY." -->\n":'')
+                                                .(_FC_DEBUG?"\n<!-- read "._FC_KEY." -->\n":''),
+                                        'time' => @filemtime(_FILE_META)
                                 ),
                                 _FC_PERIODE
@@ -82 +83 @@
 $GLOBALS['spip_pipeline']['affichage_final'] = preg_replace(',\|mutualisation_url_img_courtes|^,','\0|Fastcache_affichage_final', $GLOBALS['spip_pipeline']['affichage_final']);
 
+# Un recalcul provoque l'invalidation, par l'astuce du touch
+if (isset($_GET['var_mode'])) @touch(_FILE_META);
+
 ?>