WebSVN – Moodle – Diff – /lib/setuplib.php

     if (defined('BEHAT_SITE_RUNNING') && BEHAT_SITE_RUNNING) {
         return null;
     }
-    if (!$CFG->debugdisplay) {
+    if (empty($CFG->debugdisplay)) {
         return null;
+    }
  * Only to be used only from lib/setup.php
  */
 function initialise_local_config_cache() {
     global $CFG;
+    $bootstraplocalfile = $CFG->localcachedir . '/bootstrap.php';
+    $bootstrapsharedfile = $CFG->cachedir . '/bootstrap.php';
+    if (!is_readable($bootstraplocalfile) && is_readable($bootstrapsharedfile)) {
+        // If we don't have a local cache but do have a shared cache then clone it,
+        // for example when scaling up new front ends.
+        make_localcache_directory('', true);
+        copy($bootstrapsharedfile, $bootstraplocalfile);
-    $bootstrapcachefile = $CFG->localcachedir . '/bootstrap.php';
+    }
-    if (!empty($CFG->siteidentifier) && !file_exists($bootstrapcachefile)) {
+    if (!empty($CFG->siteidentifier) && !file_exists($bootstrapsharedfile) && defined('SYSCONTEXTID')) {
         $contents = "<?php
 // ********** This file is generated DO NOT EDIT **********
 \$CFG->siteidentifier = " . var_export($CFG->siteidentifier, true) . ";
 \$CFG->bootstraphash = " . var_export(hash_local_config_cache(), true) . ";
 // Only if the file is not stale and has not been defined.
 if (\$CFG->bootstraphash === hash_local_config_cache() && !defined('SYSCONTEXTID')) {
     define('SYSCONTEXTID', ".SYSCONTEXTID.");
+}
-}
+";
 ";
         // Create the central bootstrap first.
-        $temp = $bootstrapcachefile . '.tmp' . uniqid();
+        $temp = $bootstrapsharedfile . '.tmp' . uniqid();
+        file_put_contents($temp, $contents);
+        @chmod($temp, $CFG->filepermissions);
+        rename($temp, $bootstrapsharedfile);
-        file_put_contents($temp, $contents);
+        // Then prewarm the local cache as well.
-        @chmod($temp, $CFG->filepermissions);
+        make_localcache_directory('', true);
-        rename($temp, $bootstrapcachefile);
+        copy($bootstrapsharedfile, $bootstraplocalfile);
+    }
             protect_directory($CFG->localcachedir);
+        }
         touch($timestampfile);
         @chmod($timestampfile, $CFG->filepermissions);
         clearstatcache();
+        // Then prewarm the local boostrap.php file as well.
+        initialise_local_config_cache();
+    }
     if ($directory === '') {
         return $CFG->localcachedir;

Proyectos de Subversion Moodle

(root)/lib/setuplib.php – Rev 1 → 11