Changeset 657

Timestamp:

08/05/2011 02:22:08 AM (10 months ago)

Author:

ofer

Message:

Support for memcached

Location:

trunk/WordPress/plugin/transposh

Files:

• core/constants.php (modified) (1 diff)
• wp/transposh_admin.php (modified) (1 diff)
• wp/transposh_db.php (modified) (6 diffs)

trunk/WordPress/plugin/transposh/core/constants.php

@@ -21 +21 @@
 define('TP_ENABLE_CACHE', TRUE);
 //What is the cache items TTL
-define('TP_CACHE_TTL', 3600);
+define('TP_CACHE_TTL', 3600*24);
+//Constants for memcached
+define('TP_MEMCACHED_SRV', '127.0.0.1');
+define('TP_MEMCACHED_PORT', 11211);
 
 //Class marking a section not be translated.

trunk/WordPress/plugin/transposh/wp/transposh_admin.php

@@ -232 +232 @@
         }
 
-        if (!function_exists('apc_fetch') && !function_exists('xcache_get') && !function_exists('eaccelerator_get')) {
+        if (!(class_exists('Memcache') && @$this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT)) && !function_exists('apc_fetch') && !function_exists('xcache_get') && !function_exists('eaccelerator_get')) {
             $this->add_warning('tp_cache_warning', __('We were not able to find a supported in-memory caching engine, installing one can improve performance.', TRANSPOSH_TEXT_DOMAIN) . ' <a href="http://transposh.org/faq#performance">' . __('Check Transposh FAQs', TRANSPOSH_TEXT_DOMAIN) . '</a>');
         }

trunk/WordPress/plugin/transposh/wp/transposh_db.php

@@ -40 +40 @@
     /** @var string translation log table name */
     private $translation_log_table;
+    /** @var boolean is memcached working */
+    private $memcache_working = false;
+    /** @var Memcache the memcached connection object */
+    private $memcache;
 
     /**
@@ -48 +52 @@
         $this->translation_table = $GLOBALS['wpdb']->prefix . TRANSLATIONS_TABLE;
         $this->translation_log_table = $GLOBALS['wpdb']->prefix . TRANSLATIONS_LOG;
+
+        if (class_exists('Memcache')) {
+            logger('I am using memcached!', 3);
+            $this->memcache_working = true;
+            $this->memcache = new Memcache;
+            @$this->memcache->connect(TP_MEMCACHED_SRV, TP_MEMCACHED_PORT) or $this->memcache_working = false;
+            logger($this->memcache_working);
+        }
     }
 
@@ -60 +72 @@
         $cached = false;
         $key = $lang . '_' . $original;
-        if (function_exists('apc_fetch')) {
+        if ($this->memcache_working) {
+            $cached = $this->memcache->get($key);
+            logger('memcached', 5);
+        } elseif (function_exists('apc_fetch')) {
             $cached = apc_fetch($key, $rc);
             if ($rc === false) return false;
@@ -94 +109 @@
         if ($translated !== null) $translated = implode('_', $translated);
         $rc = false;
-        if (function_exists('apc_store')) {
+        if ($this->memcache_working) {
+            $rc = $this->memcache->set($key, $translated); //, time() + $ttl);
+        } elseif (function_exists('apc_store')) {
             $rc = apc_store($key, $translated, $ttl);
         } elseif (function_exists('xcache_set')) {
@@ -118 +135 @@
         if (!TP_ENABLE_CACHE) return;
         $key = $lang . '_' . $original;
-        if (function_exists('apc_delete')) {
+        if ($this->memcache_working) {
+            $this->memcache->delete($key);
+        } elseif (function_exists('apc_delete')) {
             apc_delete($key);
         } elseif (function_exists('xcache_unset')) {
@@ -132 +151 @@
     function cache_clean() {
         if (!TP_ENABLE_CACHE) return;
-        if (function_exists('apc_clear_cache')) {
+        if ($this->memcache_working) {
+            $this->memcache->flush();
+        } elseif (function_exists('apc_clear_cache')) {
             apc_clear_cache('user');
         } elseif (function_exists('xcache_unset_by_prefix')) {