Skip to content
Snippets Groups Projects
Verified Commit a8edc1b8 authored by Jess's avatar Jess
Browse files

Issue #3131358 by smustgrave, markdorison, pooja saraah, colan, cilefen, Chi,... 

Issue #3131358 by smustgrave, markdorison, pooja saraah, colan, cilefen, Chi, solideogloria: Make APCu requirements errors precise and explanatory
parent e7b87b5c
No related branches found
No related tags found
31 merge requests!7452Issue #1797438. HTML5 validation is preventing form submit and not fully...,!54479.5.x SF update,!5014Issue #3071143: Table Render Array Example Is Incorrect,!4868Issue #1428520: Improve menu parent link selection,!4289Issue #1344552 by marcingy, Niklas Fiekas, Ravi.J, aleevas, Eduardo Morales...,!4114Issue #2707291: Disable body-level scrolling when a dialog is open as a modal,!4100Issue #3249600: Add support for PHP 8.1 Enums as allowed values for list_* data types,!3630Issue #2815301 by Chi, DanielVeza, kostyashupenko, smustgrave: Allow to create...,!3600Issue #3344629: Passing null to parameter #1 ($haystack) of type string is deprecated,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2074Issue #2707689: NodeForm::actions() checks for delete access on new entities,!2062Issue #3246454: Add weekly granularity to views date sort,!1591Issue #3199697: Add JSON:API Translation experimental module,!1484Exposed filters get values from URL when Ajax is on,!1255Issue #3238922: Refactor (if feasible) uses of the jQuery serialize function to use vanillaJS,!1162Issue #3100350: Unable to save '/' root path alias,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!957Added throwing of InvalidPluginDefinitionException from getDefinition().,!925Issue #2339235: Remove taxonomy hard dependency on node module,!877Issue #2708101: Default value for link text is not saved,!872Draft: Issue #3221319: Race condition when creating menu links and editing content deletes menu links,!844Resolve #3036010 "Updaters",!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493,!485Sets the autocomplete attribute for username/password input field on login form.,!30Issue #3182188: Updates composer usage to point at ./vendor/bin/composer
Hide whitespace changes
Inline Side-by-side
core/modules/system/system.install
+ 16
− 9
View file @ a8edc1b8
...@@ -416,15 +416,16 @@ function system_requirements($phase) { ...@@ -416,15 +416,16 @@ function system_requirements($phase) {
// Check to see if APCu is installed and configured correctly. // Check to see if APCu is installed and configured correctly.
if ($phase == 'runtime' && PHP_SAPI != 'cli') { if ($phase == 'runtime' && PHP_SAPI != 'cli') {
$requirements['php_apcu']['title'] = t('PHP APCu caching'); $requirements['php_apcu_enabled']['title'] = t('PHP APCu caching');
$requirements['php_apcu_available']['title'] = t('PHP APCu available caching');
if (extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN)) { if (extension_loaded('apcu') && filter_var(ini_get('apc.enabled'), FILTER_VALIDATE_BOOLEAN)) {
$memory_info = apcu_sma_info(TRUE); $memory_info = apcu_sma_info(TRUE);
$apcu_actual_size = format_size($memory_info['seg_size']); $apcu_actual_size = format_size($memory_info['seg_size']);
$apcu_recommended_size = '32 MB'; $apcu_recommended_size = '32 MB';
$requirements['php_apcu']['value'] = t('Enabled (@size)', ['@size' => $apcu_actual_size]); $requirements['php_apcu_enabled']['value'] = t('Enabled (@size)', ['@size' => $apcu_actual_size]);
if (Bytes::toNumber($apcu_actual_size) < Bytes::toNumber($apcu_recommended_size)) { if (Bytes::toNumber($apcu_actual_size) < Bytes::toNumber($apcu_recommended_size)) {
$requirements['php_apcu']['severity'] = REQUIREMENT_WARNING; $requirements['php_apcu_enabled']['severity'] = REQUIREMENT_WARNING;
$requirements['php_apcu']['description'] = t('Depending on your configuration, Drupal can run with a @apcu_size APCu limit. However, a @apcu_default_size APCu limit (the default) or above is recommended, especially if your site uses additional custom or contributed modules.', [ $requirements['php_apcu_enabled']['description'] = t('Depending on your configuration, Drupal can run with a @apcu_size APCu limit. However, a @apcu_default_size APCu limit (the default) or above is recommended, especially if your site uses additional custom or contributed modules.', [
'@apcu_size' => $apcu_actual_size, '@apcu_size' => $apcu_actual_size,
'@apcu_default_size' => $apcu_recommended_size, '@apcu_default_size' => $apcu_recommended_size,
]); ]);
...@@ -432,21 +433,27 @@ function system_requirements($phase) { ...@@ -432,21 +433,27 @@ function system_requirements($phase) {
else { else {
$memory_available = $memory_info['avail_mem'] / $memory_info['seg_size']; $memory_available = $memory_info['avail_mem'] / $memory_info['seg_size'];
if ($memory_available < 0.1) { if ($memory_available < 0.1) {
$requirements['php_apcu']['severity'] = REQUIREMENT_ERROR; $requirements['php_apcu_available']['severity'] = REQUIREMENT_ERROR;
$requirements['php_apcu_available']['description'] = t('APCu is using over 90% of its allotted memory (@apcu_actual_size). To improve APCu performance, consider increasing this limit.', [
'@apcu_actual_size' => $apcu_actual_size,
]);
} }
elseif ($memory_available < 0.25) { elseif ($memory_available < 0.25) {
$requirements['php_apcu']['severity'] = REQUIREMENT_WARNING; $requirements['php_apcu_available']['severity'] = REQUIREMENT_WARNING;
$requirements['php_apcu_available']['description'] = t('APCu is using over 75% of its allotted memory (@apcu_actual_size). To improve APCu performance, consider increasing this limit.', [
'@apcu_actual_size' => $apcu_actual_size,
]);
} }
else { else {
$requirements['php_apcu']['severity'] = REQUIREMENT_OK; $requirements['php_apcu_available']['severity'] = REQUIREMENT_OK;
} }
$requirements['php_apcu']['description'] = t('Memory available: @available.', [ $requirements['php_apcu_available']['value'] = t('Memory available: @available.', [
'@available' => format_size($memory_info['avail_mem']), '@available' => format_size($memory_info['avail_mem']),
]); ]);
} }
} }
else { else {
$requirements['php_apcu'] += [ $requirements['php_apcu_enabled'] += [
'value' => t('Not enabled'), 'value' => t('Not enabled'),
'severity' => REQUIREMENT_INFO, 'severity' => REQUIREMENT_INFO,
'description' => t('PHP APCu caching can improve your site\'s performance considerably. It is <strong>highly recommended</strong> to have <a href="https://www.php.net/manual/apcu.installation.php" target="_blank">APCu</a> installed on your server.'), 'description' => t('PHP APCu caching can improve your site\'s performance considerably. It is <strong>highly recommended</strong> to have <a href="https://www.php.net/manual/apcu.installation.php" target="_blank">APCu</a> installed on your server.'),
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment