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.

Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Katrin Fischer  <katrin.fischer@bsz-bw.de>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/about.pl b/about.pl
index 0fdceb2..a8e836f 100755 (executable)
--- 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 adea4f3..3ea81d5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt
@@ -52,9 +52,10 @@
             <tr><th scope="row">PSGI: </th><td>[% psgi_server |html %]</td></tr>
           [% END %]
             <tr><th scope="row">Memcached: </th>
-                <td>Servers: [% IF memcached_servers %][% memcached_servers | html %]
+                <td>
+                    Servers: [% IF memcached_servers %]<span>[% memcached_servers | html %]</span>
                              [% ELSE %]<span>undefined</span>[% END %]|
-                    Namespace: [% IF memcached_namespace %][% memcached_namespace | html %]
+                    Namespace: [% IF memcached_namespace %]<span>[% memcached_namespace | html %]</span>
                                [% ELSE %]<span>undefined</span>[% END %] |
                     Status: [% IF memcached_servers %]
                                 [% IF memcached_running %]<span class="status_ok">running</span>
@@ -62,6 +63,9 @@
                             [% ELSE %]
                                 <span>unknown</span>
                             [% END %]
+                  [% IF effective_caching_method != 'Cache::Memcached::Fast' %]
+                    | Effective caching method: [% effective_caching_method %]
+                  [% END %]
                 </td>
             </tr>
             <tr><th scope="row">Zebra version: </th><td>[% zebraVersion |html %]</td></tr>