L-electron-Rare/moodle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'MDL-59154-master' of git://github.com/andrewnicols/moodle

Browse Source
This commit is contained in:
Jun Pataleta
2017-06-12 13:44:57 +08:00
parent 8363ec8637 d0f6660b98
commit 46f2ea5dba
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
theme/styles.php
+17 -15
View File
@@ -149,25 +149,26 @@ if ($type === 'editor') {
css_store_css($theme, "$candidatedir/editor.css", $csscontent, false);
} else {
// Fetch a lock whilst the CSS is fetched as this can be slow and CPU intensive.
// Each client should wait for one to finish the compilation before starting the compiler.
$lockfactory = \core\lock\lock_config::get_lock_factory('core_theme_get_css_content');
$lock = $lockfactory->get_lock($themename, rand(90, 120));
$lock = null;
// Lock system to prevent concurrent requests to compile LESS/SCSS, which is really slow and CPU intensive.
// Each client should wait for one to finish the compilation before starting a new compiling process.
// We only do this when the file will be cached...
if (in_array($type, ['less', 'scss']) && $cache) {
$lockfactory = \core\lock\lock_config::get_lock_factory('core_theme_get_css_content');
// We wait for the lock to be acquired, the timeout does not need to be strict here.
$lock = $lockfactory->get_lock($themename, rand(15, 30));
if (file_exists($candidatesheet)) {
// The file was built while we waited for the lock, we release the lock and serve the file.
if ($lock) {
$lock->release();
}
if (file_exists($candidatesheet)) {
// The file was built while we waited for the lock, we release the lock and serve the file.
if ($lock) {
$lock->release();
}
if ($cache) {
css_send_cached_css($candidatesheet, $etag);
} else {
css_send_uncached_css(file_get_contents($candidatesheet));
}
}
// Older IEs require smaller chunks.
// The lock is still held, and the sheet still does not exist.
// Compile the CSS content.
$csscontent = $theme->get_css_content();
$relroot = preg_replace('|^http.?://[^/]+|', '', $CFG->wwwroot);
@@ -187,8 +188,9 @@ if ($type === 'editor') {
css_store_css($theme, "$candidatedir/$type.css", $csscontent, true, $chunkurl);
// Release the lock.
if ($lock) {
// Now that the CSS has been generated and/or stored, release the lock.
// This will allow waiting clients to use the newly generated and stored CSS.
$lock->release();
}
}