From 919ccdd0253182d88e8ce58903439058dfea7ecc Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Wed, 7 Sep 2016 12:45:23 -0300 Subject: [PATCH] Bug 17261: (followup) Rebase against 17189 and 11921 This patch adjusts the original one so it works on top of 17189 and 11921. It adds an 'Effective caching method' text which can be useful, when memcached is not available. --- about.pl | 14 ++++++++------ koha-tmpl/intranet-tmpl/prog/en/modules/about.tt | 8 ++++++-- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/about.pl b/about.pl index 0fdceb2..a8e836f 100755 --- a/about.pl +++ b/about.pl @@ -36,6 +36,7 @@ use C4::Installer; use Koha; use Koha::Acquisition::Currencies; use Koha::Patrons; +use Koha::Caches; use Koha::Config::SysPrefs; use C4::Members::Statistics; @@ -71,15 +72,16 @@ if ( any { /(^psgi\.|^plack\.)/i } keys %ENV ) { } # Memcached configuration +my $memcached_servers = $ENV{MEMCACHED_SERVERS} // C4::Context->config('memcached_servers'); +my $memcached_namespace = $ENV{MEMCACHED_NAMESPACE} // C4::Context->config('memcached_namespace'); -my $memcached_servers = $ENV{ MEMCACHED_SERVERS }; -my $memcached_namespace = $ENV{ MEMCACHED_NAMESPACE }; -my $memcached_running = C4::Context->ismemcached; +my $effective_caching_method = ref(Koha::Caches->get_instance->cache); $template->param( - memcached_servers => $ENV{ MEMCACHED_SERVERS }, - memcached_namespace => $ENV{ MEMCACHED_NAMESPACE }, - memcached_running => C4::Context->ismemcached + effective_caching_method => $effective_caching_method, + memcached_servers => $memcached_servers, + memcached_namespace => $memcached_namespace, + memcached_running => Koha::Caches->get_instance->memcached_cache ); # Additional system information for warnings diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt index f2b5e26..f9b4b99 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt @@ -52,9 +52,10 @@ PSGI: [% psgi_server |html %] [% END %] Memcached: - Servers: [% IF memcached_servers %][% memcached_servers | html %] + + Servers: [% IF memcached_servers %][% memcached_servers | html %] [% ELSE %]undefined[% END %]| - Namespace: [% IF memcached_namespace %][% memcached_namespace | html %] + Namespace: [% IF memcached_namespace %][% memcached_namespace | html %] [% ELSE %]undefined[% END %] | Status: [% IF memcached_servers %] [% IF memcached_running %]running @@ -62,6 +63,9 @@ [% ELSE %] unknown [% END %] + [% IF effective_caching_method != 'Cache::Memcached::Fast' %] + | Effective caching method: [% effective_caching_method %] + [% END %] Zebra version: [% zebraVersion |html %] -- 2.7.4