Bug 28606: Remove $DEBUG and $ENV{DEBUG}

[koha-ffzg.git] / Koha / Cache.pm

diff --git a/Koha/Cache.pm b/Koha/Cache.pm
index 54fe72f..ec153ba 100644 (file)
--- a/Koha/Cache.pm
+++ b/Koha/Cache.pm
@@ -45,6 +45,7 @@ use Module::Load::Conditional qw(can_load);
 use Sereal::Encoder;
 use Sereal::Decoder;
 
+use C4::Context;
 use Koha::Cache::Object;
 use Koha::Config;
 
@@ -72,18 +73,13 @@ sub new {
 
     my $subnamespace = $params->{subnamespace} // '';
 
-    $ENV{DEBUG} && carp "Default caching system: $self->{'default_type'}";
-
     $self->{'timeout'}   ||= 0;
     # Should we continue to support MEMCACHED ENV vars?
     $self->{'namespace'} ||= $ENV{MEMCACHED_NAMESPACE};
     my @servers = split /,/, $ENV{MEMCACHED_SERVERS} || '';
-    unless ( $self->{namespace} and @servers ) {
-        my $koha_config = Koha::Config->read_from_file( Koha::Config->guess_koha_conf() );
-        $self->{namespace} ||= $koha_config->{config}{memcached_namespace} || 'koha';
-        @servers = split /,/, $koha_config->{config}{memcached_servers} // ''
-            unless @servers;
-    }
+    $self->{namespace} ||= C4::Context->config('memcached_namespace') || 'koha';
+    @servers = split /,/, C4::Context->config('memcached_servers') // ''
+        unless @servers;
     $self->{namespace} .= ":$subnamespace:";
 
     if ( $self->{'default_type'} eq 'memcached'
@@ -94,8 +90,6 @@ sub new {
         $self->{'cache'} = $self->{'memcached_cache'};
     }
 
-    $ENV{DEBUG} && carp "Selected caching system: " . ($self->{'cache'} // 'none');
-
     return
       bless $self,
       $class;
@@ -106,11 +100,6 @@ sub _initialize_memcached {
 
     return unless @servers;
 
-    $ENV{DEBUG}
-      && carp "Memcached server settings: "
-      . join( ', ', @servers )
-      . " with "
-      . $self->{'namespace'};
     # Cache::Memcached::Fast::Safe doesn't allow a default expire time to be set
     # so we force it on setting.
     my $memcached = Cache::Memcached::Fast::Safe->new(
@@ -179,7 +168,6 @@ sub set_in_cache {
 
     my $cache = $options->{cache} || 'cache';
     croak "No key" unless $key;
-    $ENV{DEBUG} && carp "set_in_cache for $key";
 
     return unless ( $self->{$cache} && ref( $self->{$cache} ) =~ m/^Cache::/ );
     my $expiry = $options->{expiry};
@@ -247,7 +235,6 @@ sub get_from_cache {
     my $unsafe = $options->{unsafe} || 0;
     $key =~ s/[\x00-\x20]/_/g;
     croak "No key" unless $key;
-    $ENV{DEBUG} && carp "get_from_cache for $key";
     return unless ( $self->{$cache} && ref( $self->{$cache} ) =~ m/^Cache::/ );
 
     # Return L1 cache value if exists