Skip to content

Always recommend object cache on multisite #200

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 1, 2022
Merged

Always recommend object cache on multisite #200

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8236783
always recommend object cache on multisite
tillkruss Mar 1, 2022
d9663b7
adjust tests for multisite env
tillkruss Mar 1, 2022
0fe4efa
Update health-check-test.php
tillkruss Mar 1, 2022
24735d0
rename method
tillkruss Mar 1, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions modules/object-cache/persistent-object-cache-health-check/load.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ function perflab_oc_health_persistent_object_cache() {
return $result;
}

if ( ! perflab_oc_health_should_persistent_object_cache() ) {
if ( ! perflab_oc_health_should_suggest_persistent_object_cache() ) {
$result['label'] = __( 'A persistent object cache is not required', 'performance-lab' );

return $result;
Expand Down Expand Up @@ -135,9 +135,13 @@ function perflab_oc_health_persistent_object_cache() {
*
* @return bool Whether to suggest using a persistent object cache.
*/
function perflab_oc_health_should_persistent_object_cache() {
function perflab_oc_health_should_suggest_persistent_object_cache() {
global $wpdb;

if ( is_multisite() ) {
return true;
}

/**
* Filter to force suggestion to use a persistent object cache and bypass threshold checks.
*
Expand Down
18 changes: 15 additions & 3 deletions tests/modules/object-cache/persistent-object-cache-health-check/health-check-test.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,29 @@

class Object_Cache_Health_Check_Tests extends WP_UnitTestCase {

/**
* @group ms-excluded
*/
function test_object_cache_default_thresholds() {
$this->assertFalse(
perflab_oc_health_should_persistent_object_cache()
perflab_oc_health_should_suggest_persistent_object_cache()
);
}

/**
* @group ms-required
*/
function test_object_cache_default_thresholds_on_multisite() {
$this->assertTrue(
perflab_oc_health_should_suggest_persistent_object_cache()
);
}

function test_object_cache_thresholds_check_can_be_bypassed() {
add_filter( 'perflab_oc_site_status_suggest_persistent_object_cache', '__return_true' );

$this->assertTrue(
perflab_oc_health_should_persistent_object_cache()
perflab_oc_health_should_suggest_persistent_object_cache()
);
}

Expand All @@ -34,7 +46,7 @@ function ( $thresholds ) use ( $threshold, $count ) {
);

$this->assertTrue(
perflab_oc_health_should_persistent_object_cache()
perflab_oc_health_should_suggest_persistent_object_cache()
);
}

Expand Down