mirror_php/winter
1
0
Fork 0
mirror of https://github.com/wintercms/winter.git synced 2024-06-28 05:33:29 +02:00
Code Issues Projects Releases Wiki Activity

Bust OP cache for CMS template cache files

Browse Source 
Fixes #2385
This commit is contained in:
Samuel Georges 2017-01-20 07:20:08 +11:00
parent f67c38b303
commit 22bc5fce68
2 changed files with 40 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
modules/cms/classes/CodeParser.php
View File

@ -150,13 +150,9 @@ class CodeParser
$this->validate($fileContents);
$this->makeDirectoryForPath($path);
$this->makeDirectorySafe(dirname($path));
if (!@file_put_contents($path, $fileContents, LOCK_EX)) {
throw new SystemException(Lang::get('system::lang.file.create_fail', ['name'=>$path]));
}
File::chmod($path);
$this->writeContentSafe($path, $fileContents);
return $className;
}
@ -313,12 +309,45 @@ class CodeParser
}
/**
* Make directory with concurrency support
* Writes content with concurrency support and cache busting
* This work is based on the Twig_Cache_Filesystem class
*/
protected function makeDirectoryForPath($path)
protected function writeContentSafe($path, $content)
{
$count = 0;
$tmpFile = tempnam(dirname($path), basename($path));
if (@file_put_contents($tmpFile, $content) === false) {
throw new SystemException(Lang::get('system::lang.file.create_fail', ['name'=>$tmpFile]));
}
while (!@rename($tmpFile, $path)) {
usleep(rand(50000, 200000));
if ($count++ > 10) {
throw new SystemException(Lang::get('system::lang.file.create_fail', ['name'=>$path]));
}
}
File::chmod($path);
/*
* Compile cached file into bytecode cache
*/
if (function_exists('opcache_invalidate')) {
opcache_invalidate($path, true);
}
elseif (function_exists('apc_compile_file')) {
apc_compile_file($path);
}
}
/**
* Make directory with concurrency support
*/
protected function makeDirectorySafe($dir)
{
$count = 0;
$dir = dirname($path);
if (is_dir($dir)) {
if (!is_writable($dir)) {
@ -336,7 +365,6 @@ class CodeParser
}
}
File::chmodRecursive($path);
File::chmodRecursive($dir);
}
}

2
modules/system/classes/CombineAssets.php
View File

@ -376,7 +376,7 @@ class CombineAssets
}
if (!File::isDirectory($this->storagePath)) {
File::makeDirectory($this->storagePath);
@File::makeDirectory($this->storagePath);
}
$cache = new FilesystemCache($this->storagePath);