X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=C4%2FContext.pm;h=0417c45075341cad9ef1091424e3a364f3202f1a;hb=c9d0c168679d6b225e305b45331e1e86ee4939d1;hp=770973fd1a005e6872fdc6afb6d59e2b7aea9923;hpb=e93126834cddfb5e0f33f0f8df77e67ee2a68b48;p=koha_gimpoz

diff --git a/C4/Context.pm b/C4/Context.pm
index 770973fd1a..0417c45075 100644
--- a/C4/Context.pm
+++ b/C4/Context.pm
@@ -83,18 +83,19 @@ BEGIN {
     $servers = $ENV{'MEMCACHED_SERVERS'};
     if ($servers) {
         # Load required libraries and create the memcached object
-	require Cache::Memcached;
-	$memcached = Cache::Memcached->new({
-		      servers => [ $servers ],
-		      debug   => 0,
-		      compress_threshold => 10_000,
-		      namespace => $ENV{'MEMCACHED_NAMESPACE'} || 'koha'
-		  });
+        require Cache::Memcached;
+        $memcached = Cache::Memcached->new({
+        servers => [ $servers ],
+        debug   => 0,
+        compress_threshold => 10_000,
+        expire_time => 600,
+        namespace => $ENV{'MEMCACHED_NAMESPACE'} || 'koha'
+    });
         # Verify memcached available (set a variable and test the output)
-	$ismemcached = $memcached->set('ismemcached','1');
+    $ismemcached = $memcached->set('ismemcached','1');
     }
 
-	$VERSION = '3.00.00.036';
+    $VERSION = '3.00.00.036';
 }
 
 use DBI;
@@ -253,6 +254,31 @@ sub read_config_file {		# Pass argument naming config file to read
     return $koha;			# Return value: ref-to-hash holding the configuration
 }
 
+=head2 ismemcached
+
+Returns the value of the $ismemcached variable (0/1)
+
+=cut
+
+sub ismemcached {
+    return $ismemcached;
+}
+
+=head2 memcached
+
+If $ismemcached is true, returns the $memcache variable.
+Returns undef otherwise
+
+=cut
+
+sub memcached {
+    if ($ismemcached) {
+      return $memcached;
+    } else {
+      return undef;
+    }
+}
+
 # db_scheme2dbi
 # Translates the full text name of a database into de appropiate dbi name
 # 
@@ -336,15 +362,15 @@ sub new {
     }
     
     if ($ismemcached) {
-      # retreive from memcached
-      $self = $memcached->get('kohaconf');
-      if (not defined $self) {
-	# not in memcached yet
-	$self = read_config_file($conf_fname);
-      }
+        # retreive from memcached
+        $self = $memcached->get('kohaconf');
+        if (not defined $self) {
+            # not in memcached yet
+            $self = read_config_file($conf_fname);
+        }
     } else {
-      # non-memcached env, read from file
-      $self = read_config_file($conf_fname);
+        # non-memcached env, read from file
+        $self = read_config_file($conf_fname);
     }
 
     $self->{"config_file"} = $conf_fname;