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

(-)a/about.pl (-1 / +11 lines)
Lines 81-92 my $effective_caching_method = ref($cache->cache); Link Here
81
# FIXME What are the consequences of that??
81
# FIXME What are the consequences of that??
82
my $is_memcached_still_active = $cache->set_in_cache('test_for_about_page', "just a simple value");
82
my $is_memcached_still_active = $cache->set_in_cache('test_for_about_page', "just a simple value");
83
83
84
my $where_is_memcached_config = 'nowhere';
85
if ( $ENV{MEMCACHED_SERVERS} and C4::Context->config('memcached_servers') ) {
86
    $where_is_memcached_config = 'both';
87
} elsif ( $ENV{MEMCACHED_SERVERS} and not C4::Context->config('memcached_servers') ) {
88
    $where_is_memcached_config = 'ENV_only';
89
} elsif ( C4::Context->config('memcached_servers') ) {
90
    $where_is_memcached_config = 'config_only';
91
}
92
84
$template->param(
93
$template->param(
85
    effective_caching_method => $effective_caching_method,
94
    effective_caching_method => $effective_caching_method,
86
    memcached_servers   => $memcached_servers,
95
    memcached_servers   => $memcached_servers,
87
    memcached_namespace => $memcached_namespace,
96
    memcached_namespace => $memcached_namespace,
88
    is_memcached_still_active => $is_memcached_still_active,
97
    is_memcached_still_active => $is_memcached_still_active,
89
    memcached_running   => Koha::Caches->get_instance->memcached_cache
98
    where_is_memcached_config => $where_is_memcached_config,
99
    memcached_running   => Koha::Caches->get_instance->memcached_cache,
90
);
100
);
91
101
92
# Additional system information for warnings
102
# Additional system information for warnings
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/about.tt (-2 / +12 lines)
Lines 69-75 Link Here
69
                                [% END %]
69
                                [% END %]
70
                            [% ELSE %]
70
                            [% ELSE %]
71
                                <span>unknown</span>
71
                                <span>unknown</span>
72
                            [% END %]
72
                            [% END %] |
73
                    Config read from:
74
                    [% SWITCH where_is_memcached_config %]
75
                        [% CASE 'config_only' %]
76
                            <span class="status_ok">koha-conf.xml</span>
77
                        [% CASE 'ENV_only' %]
78
                            <span class="status_warn">ENV</span> Note that the right place to define the memcached config is in your $KOHA_CONF file
79
                        [% CASE 'both' %]
80
                            <span class="status_warn">ENV and koha-conf.xml</span> Note that the right place to define the memcached config is in your $KOHA_CONF file. To avoid any misunderstanding you whould not export the memcached config from ENV.
81
                        [% CASE # nowhere %]
82
                            <span class="status_warn">Nowhere</span> Note that the right place to define the memcached config is in your $KOHA_CONF file. Currently you do not have a valid memcached configuration defined.
83
                    [% END %]
73
                  [% IF effective_caching_method != 'Cache::Memcached::Fast' %]
84
                  [% IF effective_caching_method != 'Cache::Memcached::Fast' %]
74
                    | Effective caching method: [% effective_caching_method %]
85
                    | Effective caching method: [% effective_caching_method %]
75
                  [% END %]
86
                  [% END %]
76
- 

Return to bug 17274