Attachment #55309 for bug #17261

View | Details | Raw Unified | Return to bug 17261
Collapse All | Expand All




use Koha;
use Koha::Acquisition::Currencies;
use Koha::Patrons;
use Koha::Caches;
use Koha::Config::SysPrefs;
use C4::Members::Statistics;


}

# 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 $effective_caching_method = ref(Koha::Caches->get_instance->cache);
my $memcached_namespace = $ENV{ MEMCACHED_NAMESPACE };
my $memcached_running = C4::Context->ismemcached;

$template->param(
    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

Lines 52-60 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-3 / +6 lines)
52	<tr><th scope="row">PSGI: </th><td>[% psgi_server \|html %]</td></tr>	52	<tr><th scope="row">PSGI: </th><td>[% psgi_server \|html %]</td></tr>
53	[% END %]	53	[% END %]
54	<tr><th scope="row">Memcached: </th>	54	<tr><th scope="row">Memcached: </th>
55	<td>Servers: [% IF memcached_servers %][% memcached_servers \| html %]	55	<td>
		56	Servers: [% IF memcached_servers %]<span>[% memcached_servers \| html %]</span>
56	[% ELSE %]<span>undefined</span>[% END %]\|	57	[% ELSE %]<span>undefined</span>[% END %]\|
57	Namespace: [% IF memcached_namespace %][% memcached_namespace \| html %]	58	Namespace: [% IF memcached_namespace %]<span>[% memcached_namespace \| html %]</span>
58	[% ELSE %]<span>undefined</span>[% END %] \|	59	[% ELSE %]<span>undefined</span>[% END %] \|
59	Status: [% IF memcached_servers %]	60	Status: [% IF memcached_servers %]
60	[% IF memcached_running %]<span class="status_ok">running</span>	61	[% IF memcached_running %]<span class="status_ok">running</span>
Lines 62-67 Link Here
62	[% ELSE %]	63	[% ELSE %]
63	<span>unknown</span>	64	<span>unknown</span>
64	[% END %]	65	[% END %]
		66	[% IF effective_caching_method != 'Cache::Memcached::Fast' %]
		67	\| Effective caching method: [% effective_caching_method %]
		68	[% END %]
65	</td>	69	</td>
66	</tr>	70	</tr>
67	<tr><th scope="row">Zebra version: </th><td>[% zebraVersion \|html %]</td></tr>	71	<tr><th scope="row">Zebra version: </th><td>[% zebraVersion \|html %]</td></tr>
68	-

Return to bug 17261

Lines 36-41 use C4::Installer; Link Here

(-)a/about.pl (-6 / +8 lines)
36	use Koha;	36	use Koha;
37	use Koha::Acquisition::Currencies;	37	use Koha::Acquisition::Currencies;
38	use Koha::Patrons;	38	use Koha::Patrons;
		39	use Koha::Caches;
39	use Koha::Config::SysPrefs;	40	use Koha::Config::SysPrefs;
40	use C4::Members::Statistics;	41	use C4::Members::Statistics;
41		42
Lines 71-85 if ( any { /(^psgi\.\|^plack\.)/i } keys %ENV ) { Link Here
71	}	72	}
72		73
73	# Memcached configuration	74	# Memcached configuration
		75	my $memcached_servers = $ENV{MEMCACHED_SERVERS} // C4::Context->config('memcached_servers');
		76	my $memcached_namespace = $ENV{MEMCACHED_NAMESPACE} // C4::Context->config('memcached_namespace');
74		77
75	my $memcached_servers = $ENV{ MEMCACHED_SERVERS };	78	my $effective_caching_method = ref(Koha::Caches->get_instance->cache);
76	my $memcached_namespace = $ENV{ MEMCACHED_NAMESPACE };
77	my $memcached_running = C4::Context->ismemcached;
78		79
79	$template->param(	80	$template->param(
80	memcached_servers => $ENV{ MEMCACHED_SERVERS },	81	effective_caching_method => $effective_caching_method,
81	memcached_namespace => $ENV{ MEMCACHED_NAMESPACE },	82	memcached_servers => $memcached_servers,
82	memcached_running => C4::Context->ismemcached	83	memcached_namespace => $memcached_namespace,
		84	memcached_running => Koha::Caches->get_instance->memcached_cache
83	);	85	);
84		86
85	# Additional system information for warnings	87	# Additional system information for warnings