moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-04 16:36:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

MDL-32825 try to improve atomicity of cache file operations in themes and javascript

Browse source
This commit is contained in:
Petr Skoda 2012-05-07 17:35:09 +02:00
parent 4dd63b6d70
commit 979d320722
6 changed files with 105 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

36
theme/image.php
View file

@ -135,24 +135,36 @@ if (empty($imagefile) or !is_readable($imagefile)) {
image_not_found();
}
if ($rev > -1) {
$pathinfo = pathinfo($imagefile);
$cacheimage = "$candidatelocation/$image.".$pathinfo['extension'];
if (!file_exists($cacheimage)) {
if (!file_exists(dirname($cacheimage))) {
// Sometimes there was a race condition in check_dir_exists(),
// so let the next copy() log errors instead.
@mkdir(dirname($cacheimage), $CFG->directorypermissions, true);
}
copy($imagefile, $cacheimage);
}
send_cached_image($cacheimage, $etag);
} else {
send_uncached_image($imagefile);
clearstatcache();
if (!file_exists(dirname($cacheimage))) {
@mkdir(dirname($cacheimage), $CFG->directorypermissions, true);
}
// Prevent serving of incomplete file from concurrent request,
// the rename() should be more atomic than copy().
ignore_user_abort(true);
if (@copy($imagefile, $cacheimage.'.tmp')) {
rename($cacheimage.'.tmp', $cacheimage);
@chmod($cacheimage, $CFG->filepermissions);
@unlink($cacheimage.'.tmp'); // just in case anything fails
}
ignore_user_abort(false);
if (connection_aborted()) {
die;
}
// make sure nothing failed
clearstatcache();
if (file_exists($cacheimage)) {
send_cached_image($cacheimage, $etag);
}
}
send_uncached_image($imagefile);
//=================================================================================
//=== utility functions ==

17
theme/javascript.php
View file

@ -90,15 +90,12 @@ $rev = theme_get_revision();
$etag = sha1("$themename/$rev/$type");
if ($rev > -1) {
// note: cache reset might have purged our cache dir structure,
// make sure we do not use stale file stat cache in the next check_dir_exists()
js_write_cache_file_content($candidate, js_minify($theme->javascript_files($type)));
// verify nothing failed in cache file creation
clearstatcache();
check_dir_exists(dirname($candidate));
$fp = fopen($candidate, 'w');
fwrite($fp, js_minify($theme->javascript_files($type)));
fclose($fp);
js_send_cached($candidate, $etag);
} else {
js_send_uncached($theme->javascript_content($type));
if (file_exists($candidate)) {
js_send_cached($candidate, $etag);
}
}
js_send_uncached($theme->javascript_content($type));

7
theme/styles.php
View file

@ -118,4 +118,11 @@ if ($type === 'editor') {
$cssfile = "$CFG->cachedir/theme/$themename/css/all.css";
css_store_css($theme, $cssfile, $allfiles);
}
// verify nothing failed in cache file creation
clearstatcache();
if (!file_exists($candidatesheet)) {
css_send_css_not_found();
}
css_send_cached_css($candidatesheet, $etag);