Browse Source

Bug 13193: (RM revert) Make Memcached usage fork safe

This reverts commit f7a5466c52. We need
the new dependancy packaged first.

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
remotes/origin/19.11.x
Martin Renvoize 2 years ago
parent
commit
6c92612c15
Signed by: martin.renvoize GPG Key ID: 422B469130441A0F
  1. 7
      C4/Installer/PerlDependencies.pm
  2. 6
      Koha/Cache.pm
  3. 2
      koha-tmpl/intranet-tmpl/prog/en/modules/about.tt

7
C4/Installer/PerlDependencies.pm

@ -265,12 +265,7 @@ our $PERL_DEPS = {
'Cache::Memcached::Fast' => {
'usage' => 'Caching',
'required' => '0',
'min_ver' => '0.19'
},
'Cache::Memcached::Fast::Safe' => {
'usage' => 'Caching',
'required' => '0',
'min_ver' => '0.06'
'min_ver' => '0.17'
},
'Cache::FastMmap' => {
'usage' => 'Caching',

6
Koha/Cache.pm

@ -87,7 +87,7 @@ sub new {
$self->{namespace} .= ":$subnamespace:";
if ( $self->{'default_type'} eq 'memcached'
&& can_load( modules => { 'Cache::Memcached::Fast::Safe' => undef } )
&& can_load( modules => { 'Cache::Memcached::Fast' => undef } )
&& _initialize_memcached($self, @servers)
&& defined( $self->{'memcached_cache'} ) )
{
@ -120,9 +120,9 @@ sub _initialize_memcached {
. join( ', ', @servers )
. " with "
. $self->{'namespace'};
# Cache::Memcached::Fast::Safe doesn't allow a default expire time to be set
# Cache::Memcached::Fast doesn't allow a default expire time to be set
# so we force it on setting.
my $memcached = Cache::Memcached::Fast::Safe->new(
my $memcached = Cache::Memcached::Fast->new(
{
servers => \@servers,
compress_threshold => 10_000,

2
koha-tmpl/intranet-tmpl/prog/en/modules/about.tt

@ -102,7 +102,7 @@
[% CASE # nowhere %]
<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.
[% END %]
[% IF effective_caching_method != 'Cache::Memcached::Fast::Safe' %]
[% IF effective_caching_method != 'Cache::Memcached::Fast' %]
| Effective caching method: [% effective_caching_method | html %]
[% END %]
</td>

Loading…
Cancel
Save