moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-05 00:46:50 +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

24
lib/javascript.php
View file

@ -88,19 +88,17 @@ if ($rev > -1) {
js_send_cached($candidate, $etag);
} else {
if (!file_exists(dirname($candidate))) {
@mkdir(dirname($candidate), $CFG->directorypermissions, true);
js_write_cache_file_content($candidate, js_minify($jsfiles));
// verify nothing failed in cache file creation
clearstatcache();
if (file_exists($candidate)) {
js_send_cached($candidate, $etag);
}
$fp = fopen($candidate, 'w');
fwrite($fp, js_minify($jsfiles));
fclose($fp);
js_send_cached($candidate, $etag);
}
} else {
$content = '';
foreach ($jsfiles as $jsfile) {
$content .= file_get_contents($jsfile)."\n";
}
js_send_uncached($candidate, $etag);
}
$content = '';
foreach ($jsfiles as $jsfile) {
$content .= file_get_contents($jsfile)."\n";
}
js_send_uncached($content, $etag);