diff --git a/C4/Context.pm b/C4/Context.pm index d18fa8b94e..3747f3a974 100644 --- a/C4/Context.pm +++ b/C4/Context.pm @@ -508,6 +508,7 @@ with this method. =cut my $syspref_cache = Koha::Cache->get_instance(); +my %syspref_L1_cache; my $use_syspref_cache = 1; sub preference { my $self = shift; @@ -515,13 +516,16 @@ sub preference { $var = lc $var; + # Return the value if the var has already been accessed + if ($use_syspref_cache && exists $syspref_L1_cache{$var}) { + return $syspref_L1_cache{$var}; + } + my $cached_var = $use_syspref_cache ? $syspref_cache->get_from_cache("syspref_$var") : undef; return $cached_var if defined $cached_var; - my $dbh = C4::Context->dbh or return 0; - my $value; if ( defined $ENV{"OVERRIDE_SYSPREF_$var"} ) { $value = $ENV{"OVERRIDE_SYSPREF_$var"}; @@ -531,7 +535,10 @@ sub preference { $value = $syspref ? $syspref->value() : undef; } - $syspref_cache->set_in_cache("syspref_$var", $value) if $use_syspref_cache; + if ( $use_syspref_cache ) { + $syspref_cache->set_in_cache("syspref_$var", $value); + $syspref_L1_cache{$var} = $value; + } return $value; } @@ -584,7 +591,13 @@ will not be seen by this process. =cut sub clear_syspref_cache { - $syspref_cache->flush_all if $use_syspref_cache; + return unless $use_syspref_cache; + $syspref_cache->flush_all; + clear_syspref_L1_cache() +} + +sub clear_syspref_L1_cache { + %syspref_L1_cache = (); } =head2 set_preference @@ -635,8 +648,10 @@ sub set_preference { )->store(); } - $syspref_cache->set_in_cache( "syspref_$variable", $value ) - if $use_syspref_cache; + if ( $use_syspref_cache ) { + $syspref_cache->set_in_cache( "syspref_$variable", $value ); + $syspref_L1_cache{$variable} = $value; + } return $syspref; } @@ -655,7 +670,11 @@ sub delete_preference { my ( $self, $var ) = @_; if ( Koha::Config::SysPrefs->find( $var )->delete ) { - $syspref_cache->clear_from_cache("syspref_$var") if $use_syspref_cache; + if ( $use_syspref_cache ) { + $syspref_cache->clear_from_cache("syspref_$var"); + delete $syspref_L1_cache{$var}; + } + return 1; } return 0;