Fix cache patch

guimard · Apr 3, 2024 · 0c6cb23 · 0c6cb23
1 parent 3d5c572
commit 0c6cb23
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/Changes.md b/Changes.md
@@ -1,5 +1,6 @@
 # Changes
 
+* 2024-04-03: fix cache patch
 * 2024-03-27: add missing Jitsi/logout method
 * 2024-03-20: add PGSSLCERT=/tmp/postgres.crt
 * 2024-03-13: add patch to workaround local cache failures

diff --git a/base-no-s6/no-cache-fail.patch b/base-no-s6/no-cache-fail.patch
@@ -79,7 +79,7 @@
      }
 
      unless ($session->{args}->{updateCache}
-@@ -120,4 +127,16 @@ sub cache {
+@@ -120,4 +127,17 @@ sub cache {
      return $self->{cache};
  }
 
@@ -91,8 +91,9 @@
 +
 +sub _cache_call {
 +    my ( $sub, $self, @args ) = @_;
-+    eval { $self->cache->$sub(@args); };
++    my $res = eval { $self->cache->$sub(@args); };
 +    print STDERR "Unable to use cache: $@\n" if $@;
++    return $res;
 +}
 +
  1;
diff --git a/base/no-cache-fail.patch b/base/no-cache-fail.patch
@@ -79,7 +79,7 @@
      }
 
      unless ($session->{args}->{updateCache}
-@@ -120,4 +127,16 @@ sub cache {
+@@ -120,4 +127,17 @@ sub cache {
      return $self->{cache};
  }
 
@@ -91,8 +91,9 @@
 +
 +sub _cache_call {
 +    my ( $sub, $self, @args ) = @_;
-+    eval { $self->cache->$sub(@args); };
++    my $res = eval { $self->cache->$sub(@args); };
 +    print STDERR "Unable to use cache: $@\n" if $@;
++    return $res;
 +}
 +
  1;