lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix memcached effect was lost because init was done each time.

Browse Source
This commit is contained in:
Laurent Destailleur 2015-09-07 20:17:05 +02:00
parent 53a9c93b90
commit 0a6451d72c
2 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
htdocs/core/class/translate.class.php
View File

@ -234,7 +234,8 @@ class Translate
if ($usecachekey) if ($usecachekey)
{ {
//dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey); //dol_syslog('Translate::Load we will cache result into usecachekey '.$usecachekey);
//global $aaa; $aaa+=1;
//print $aaa." ".$usecachekey."\n";
require_once DOL_DOCUMENT_ROOT .'/core/lib/memory.lib.php'; require_once DOL_DOCUMENT_ROOT .'/core/lib/memory.lib.php';
$tmparray=dol_getcache($usecachekey); $tmparray=dol_getcache($usecachekey);
if (is_array($tmparray) && count($tmparray)) if (is_array($tmparray) && count($tmparray))

54
htdocs/core/lib/memory.lib.php
View File

@ -47,10 +47,16 @@ function dol_setcache($memoryid,$data)
// Using a memcached server // Using a memcached server
if (! empty($conf->memcached->enabled) && class_exists('Memcached')) if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
{ {
$memoryid=session_name().'_'.$memoryid; global $m;
$m=new Memcached(); if (empty($m) || ! is_object($m))
$tmparray=explode(':',$conf->global->MEMCACHED_SERVER); {
$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211); $m=new Memcached();
$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
if (! $result) return -1;
}
$memoryid=session_name().'_'.$memoryid;
//$m->setOption(Memcached::OPT_COMPRESSION, false); //$m->setOption(Memcached::OPT_COMPRESSION, false);
//print "Add memoryid=".$memoryid; //print "Add memoryid=".$memoryid;
$m->add($memoryid,$data); // This fails if key already exists $m->add($memoryid,$data); // This fails if key already exists
@ -66,10 +72,16 @@ function dol_setcache($memoryid,$data)
} }
else if (! empty($conf->memcached->enabled) && class_exists('Memcache')) else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
{ {
$memoryid=session_name().'_'.$memoryid; global $m;
$m=new Memcache(); if (empty($m) || ! is_object($m))
$tmparray=explode(':',$conf->global->MEMCACHED_SERVER); {
$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211); $m=new Memcache();
$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
if (! $result) return -1;
}
$memoryid=session_name().'_'.$memoryid;
//$m->setOption(Memcached::OPT_COMPRESSION, false); //$m->setOption(Memcached::OPT_COMPRESSION, false);
$result=$m->add($memoryid,$data); // This fails if key already exists $result=$m->add($memoryid,$data); // This fails if key already exists
if ($result) if ($result)
@ -103,10 +115,16 @@ function dol_getcache($memoryid)
// Using a memcached server // Using a memcached server
if (! empty($conf->memcached->enabled) && class_exists('Memcached')) if (! empty($conf->memcached->enabled) && class_exists('Memcached'))
{ {
global $m;
if (empty($m) || ! is_object($m))
{
$m=new Memcached();
$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
if (! $result) return -1;
}
$memoryid=session_name().'_'.$memoryid; $memoryid=session_name().'_'.$memoryid;
$m=new Memcached();
$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
//$m->setOption(Memcached::OPT_COMPRESSION, false); //$m->setOption(Memcached::OPT_COMPRESSION, false);
//print "Get memoryid=".$memoryid; //print "Get memoryid=".$memoryid;
$data=$m->get($memoryid); $data=$m->get($memoryid);
@ -124,10 +142,16 @@ function dol_getcache($memoryid)
} }
else if (! empty($conf->memcached->enabled) && class_exists('Memcache')) else if (! empty($conf->memcached->enabled) && class_exists('Memcache'))
{ {
$memoryid=session_name().'_'.$memoryid; global $m;
$m=new Memcache(); if (empty($m) || ! is_object($m))
$tmparray=explode(':',$conf->global->MEMCACHED_SERVER); {
$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211); $m=new Memcache();
$tmparray=explode(':',$conf->global->MEMCACHED_SERVER);
$result=$m->addServer($tmparray[0], $tmparray[1]?$tmparray[1]:11211);
if (! $result) return -1;
}
$memoryid=session_name().'_'.$memoryid;
//$m->setOption(Memcached::OPT_COMPRESSION, false); //$m->setOption(Memcached::OPT_COMPRESSION, false);
$data=$m->get($memoryid); $data=$m->get($memoryid);
//print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>"; //print "memoryid=".$memoryid." - rescode=".$rescode." - data=".count($data)."\n<br>";