Attachment 109284 Details for Bug 20582 – Bug 20582: Fix a cache issue in Koha::App::{Opac,Intranet}

[patch] Bug 20582: Fix a cache issue in Koha::App::{Opac,Intranet}

Bug-20582-Fix-a-cache-issue-in-KohaAppOpacIntranet.patch (text/plain), 1.98 KB, created by Julian Maurice on 2020-08-28 13:43:26 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2020-08-28 13:43:26 UTC

Size: 1.98 KB

patch

obsolete

>From 8e98f21537c5a1884250c6b1c7d1d7500001704f Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Fri, 28 Aug 2020 17:39:00 +0400
>Subject: [PATCH] Bug 20582: Fix a cache issue in Koha::App::{Opac,Intranet}
>
>This was a workaround I wrote when Koha::Caches->flush_L1_caches was not
>flushing all caches correctly. Now it's not needed and it causes
>problems, so it must be removed.
>---
> Koha/App/Intranet.pm | 12 +-----------
> Koha/App/Opac.pm     | 12 +-----------
> 2 files changed, 2 insertions(+), 22 deletions(-)
>
>diff --git a/Koha/App/Intranet.pm b/Koha/App/Intranet.pm
>index 3eddd49fab..d06c65260d 100644
>--- a/Koha/App/Intranet.pm
>+++ b/Koha/App/Intranet.pm
>@@ -66,17 +66,7 @@ sub _around_action {
>     my ($next, $c, $action, $last) = @_;
> 
>     # Flush memory caches before every request
>-    my $caches = $Koha::Caches::singleton_caches;
>-    if ($caches) {
>-        foreach my $key (keys %$caches) {
>-            my $cache = $caches->{$key};
>-            if (ref $cache->{cache} eq 'Cache::Memory') {
>-                $cache->flush_all;
>-            }
>-            $cache->flush_L1_cache;
>-        }
>-    }
>-    $Koha::Caches::singleton_caches = {};
>+    Koha::Caches->flush_L1_caches();
>     Koha::Cache::Memory::Lite->flush();
> 
>     return $next->();
>diff --git a/Koha/App/Opac.pm b/Koha/App/Opac.pm
>index 47da075b82..89ff94c5ec 100644
>--- a/Koha/App/Opac.pm
>+++ b/Koha/App/Opac.pm
>@@ -66,17 +66,7 @@ sub _around_action {
>     my ($next, $c, $action, $last) = @_;
> 
>     # Flush memory caches before every request
>-    my $caches = $Koha::Caches::singleton_caches;
>-    if ($caches) {
>-        foreach my $key (keys %$caches) {
>-            my $cache = $caches->{$key};
>-            if (ref $cache->{cache} eq 'Cache::Memory') {
>-                $cache->flush_all;
>-            }
>-            $cache->flush_L1_cache;
>-        }
>-    }
>-    $Koha::Caches::singleton_caches = {};
>+    Koha::Caches->flush_L1_caches();
>     Koha::Cache::Memory::Lite->flush();
> 
>     return $next->();
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 20582: 74173 | 74517 | 74518 | 74519 | 74520 | 79648 | 81687 | 81857 | 82423 | 84526 | 84527 | 84528 | 84529 | 84530 | 84531 | 91009 | 99267 | 103633 | 103720 | 103721 | 109282 | 109283 | 109284 | 109895 | 109896 | 109897 | 109898 | 109899 | 109900 | 111282 | 111315 | 111374