pluf2 Commit Details

Date:

2008-11-24 11:37:02 (16 years 11 months ago)

Author:

Loic d'Anterroches

Branch:

master

Commit:

3cc4430c3fc75291bf55768c832d586fd5cb7f02

Parents:

f1e66cd6feffcc933b8fa05f0b10168cf2b08c6d

Message:

Added a registry to avoid cache object duplication.

Changes:

File differences

-57
58 58
59 59
60 
60
61
62
63
61 64
62 65
63 66
+        if (false == ($engine = Pluf::f('cache_engine', false))) {␊
            throw new Pluf_Exception_SettingError('"cache_engine" setting not defined.');␊
        }␊
        return new $engine();␊
        if (!isset($GLOBALS['_PX_Pluf_Cache-'.$engine])) {␊
            $GLOBALS['_PX_Pluf_Cache-'.$engine] = new $engine();␊
        } ␊
        return $GLOBALS['_PX_Pluf_Cache-'.$engine];␊
    }␊
␊
    /**␊
         if (false == ($engine = Pluf::f('cache_engine', false))) {␊
             throw new Pluf_Exception_SettingError('"cache_engine" setting not defined.');␊
         }␊
-        return new $engine();␊
+        if (!isset($GLOBALS['_PX_Pluf_Cache-'.$engine])) {␊
+            $GLOBALS['_PX_Pluf_Cache-'.$engine] = new $engine();␊
+        } ␊
+        return $GLOBALS['_PX_Pluf_Cache-'.$engine];␊
     }␊
 ␊
     /**␊

-29
30 30
31 31
32 
32
33 33
34 34
35 35
+ */␊
class Pluf_Cache_File extends Pluf_Cache␊
{␊
    public function __constructor()␊
    public function __construct()␊
    {␊
        if (false == Pluf::f('cache_file_folder', false)) {␊
            throw new Pluf_Exception_SettingError('"cache_file_folder" setting not defined.');␊
  */␊
 class Pluf_Cache_File extends Pluf_Cache␊
 {␊
-    public function __constructor()␊
+    public function __construct()␊
     {␊
         if (false == Pluf::f('cache_file_folder', false)) {␊
             throw new Pluf_Exception_SettingError('"cache_file_folder" setting not defined.');␊

-42
43 43
44 44
45 
45
46 46
47 47
48 48
49 
49
50 50
51 51
52 52
+    private $memcache = null;␊
    private $keyprefix = '';␊
␊
    public function __constructor()␊
    public function __construct()␊
    {␊
        $this->memcache = memcache_connect(Pluf::f('cache_memcached_server', 'localhost'),␊
                                           Pluf::f('cache_memcached_port', 11211));␊
        if (false == $this->memcache) {␊
        if (false === $this->memcache) {␊
            $this->memcache = null;␊
        }␊
        $this->keyprefix = Pluf::f('cache_memcached_keyprefix', '');␊
     private $memcache = null;␊
     private $keyprefix = '';␊
 ␊
-    public function __constructor()␊
+    public function __construct()␊
     {␊
         $this->memcache = memcache_connect(Pluf::f('cache_memcached_server', 'localhost'),␊
                                            Pluf::f('cache_memcached_port', 11211));␊
-        if (false == $this->memcache) {␊
+        if (false === $this->memcache) {␊
             $this->memcache = null;␊
         }␊
         $this->keyprefix = Pluf::f('cache_memcached_keyprefix', '');␊