Bugzilla – Attachment 57050 Details for
Bug 17261
Add memcached configuration info to about.pl
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
[PASSED QA] Bug 17261: (followup) Rebase against 17189 and 11921
PASSED-QA-Bug-17261-followup-Rebase-against-17189-.patch (text/plain), 3.53 KB, created by
Katrin Fischer
on 2016-11-01 16:17:08 UTC
(
hide
)
Description:
[PASSED QA] Bug 17261: (followup) Rebase against 17189 and 11921
Filename:
MIME Type:
Creator:
Katrin Fischer
Created:
2016-11-01 16:17:08 UTC
Size:
3.53 KB
patch
obsolete
>From 40c8a8361ec03b821b60aab12daae34b3f301ea1 Mon Sep 17 00:00:00 2001 >From: Tomas Cohen Arazi <tomascohen@theke.io> >Date: Wed, 7 Sep 2016 12:45:23 -0300 >Subject: [PATCH] [PASSED QA] 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> >--- > 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 adea4f3..3ea81d5 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 @@ > <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> >-- >2.7.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17261
:
55265
|
55297
|
55309
|
55327
|
55328
|
55535
|
55536
|
55537
|
55538
|
55542
|
57049
| 57050 |
57051
|
57052
|
57053