Attachment 54820 Details for Bug 11921 – Bug 11921: Update remaining occurrences of ->ismemcached

[patch] Bug 11921: Update remaining occurrences of ->ismemcached

Bug-11921-Update-remaining-occurrences-of--ismemca.patch (text/plain), 2.54 KB, created by Jonathan Druart on 2016-08-24 11:43:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2016-08-24 11:43:12 UTC

Size: 2.54 KB

patch

obsolete

>From 373c7ea59145a77b8f62a33e5e4f41f339f10695 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 23 Jun 2016 06:33:23 +0100
>Subject: [PATCH] Bug 11921: Update remaining occurrences of ->ismemcached
>
>TODO: Would be better to provide a better way to know if memcache is correctly set
>---
> C4/Auth.pm                | 3 ++-
> Koha/Cache.pm             | 2 +-
> reports/guided_reports.pl | 3 ++-
> 3 files changed, 5 insertions(+), 3 deletions(-)
>
>diff --git a/C4/Auth.pm b/C4/Auth.pm
>index 17e2cc1..1bbe978 100644
>--- a/C4/Auth.pm
>+++ b/C4/Auth.pm
>@@ -32,6 +32,7 @@ use C4::Languages;
> use C4::Branch;       # GetBranches
> use C4::Search::History;
> use Koha;
>+use Koha::Caches;
> use Koha::AuthUtils qw(get_script_name hash_password);
> use Koha::LibraryCategories;
> use Koha::Libraries;
>@@ -1727,7 +1728,7 @@ sub get_session {
>     elsif ( $storage_method eq 'Pg' ) {
>         $session = new CGI::Session( "driver:PostgreSQL;serializer:yaml;id:md5", $sessionID, { Handle => $dbh } );
>     }
>-    elsif ( $storage_method eq 'memcached' && C4::Context->ismemcached ) {
>+    elsif ( $storage_method eq 'memcached' && Koha::Caches->get_instance->memcached_cache ) {
>         $session = new CGI::Session( "driver:memcached;serializer:yaml;id:md5", $sessionID, { Memcached => C4::Context->memcached } );
>     }
>     else {
>diff --git a/Koha/Cache.pm b/Koha/Cache.pm
>index 54bb694..136cd59 100644
>--- a/Koha/Cache.pm
>+++ b/Koha/Cache.pm
>@@ -88,7 +88,7 @@ sub new {
>     unless ( $self->{namespace} and @servers ) {
>         my $koha_config = Koha::Config->read_from_file( Koha::Config->guess_koha_conf() );
>         $self->{namespace} ||= $koha_config->{config}{memcached_namespace} || 'koha';
>-        @servers ||= split /,/, $koha_config->{config}{memcached_servers};
>+        @servers = split /,/, $koha_config->{config}{memcached_servers} unless @servers;
>     }
>     $self->{namespace} .= ":$subnamespace:";
> 
>diff --git a/reports/guided_reports.pl b/reports/guided_reports.pl
>index a825707..8e95556 100755
>--- a/reports/guided_reports.pl
>+++ b/reports/guided_reports.pl
>@@ -31,6 +31,7 @@ use C4::Debug;
> use C4::Koha qw/GetFrameworksLoop/;
> use C4::Branch;
> use C4::Context;
>+use Koha::Caches;
> use C4::Log;
> use Koha::DateUtils qw/dt_from_string output_pref/;
> use Koha::AuthorisedValue;
>@@ -47,7 +48,7 @@ Script to control the guided report creation
> =cut
> 
> my $input = new CGI;
>-my $usecache = C4::Context->ismemcached;
>+my $usecache = Koha::Caches->get_instance->memcached_cache;
> 
> my $phase = $input->param('phase') // '';
> my $flagsrequired;
>-- 
>2.8.1

Actions: View | Diff | Splinter Review

Attachments on bug 11921: 54818 | 54819 | 54820 | 55169 | 55170 | 55171 | 55258 | 55259 | 55268 | 55269 | 55270 | 55271 | 55272 | 55310 | 55311 | 55312 | 55313 | 55314 | 55315 | 55441