summaryrefslogtreecommitdiff
path: root/plugins/MemcachePlugin.php
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-16 09:22:02 -0800
committerBrion Vibber <brion@pobox.com>2010-02-16 09:22:02 -0800
commit81b6b58e33f55054b7e5dd546f06dbdb5696ed92 (patch)
tree7dddea4daac884f70d021fb11f1d02d560c0cd10 /plugins/MemcachePlugin.php
parent2e258454f396af9f95092b9564eee08179ff6be1 (diff)
parentc74aea589d5a79d7048470d44e457dffc8919ad3 (diff)
Merge branch 'master' into testing
Conflicts: lib/stompqueuemanager.php
Diffstat (limited to 'plugins/MemcachePlugin.php')
-rw-r--r--plugins/MemcachePlugin.php33
1 files changed, 32 insertions, 1 deletions
diff --git a/plugins/MemcachePlugin.php b/plugins/MemcachePlugin.php
index c5e74fb41..c3ca5c135 100644
--- a/plugins/MemcachePlugin.php
+++ b/plugins/MemcachePlugin.php
@@ -51,6 +51,8 @@ if (!defined('STATUSNET')) {
class MemcachePlugin extends Plugin
{
+ static $cacheInitialized = false;
+
private $_conn = null;
public $servers = array('127.0.0.1;11211');
@@ -71,10 +73,21 @@ class MemcachePlugin extends Plugin
function onInitializePlugin()
{
- if (is_null($this->persistent)) {
+ if (self::$cacheInitialized) {
+ $this->persistent = true;
+ } else {
+ // If we're a parent command-line process we need
+ // to be able to close out the connection after
+ // forking, so disable persistence.
+ //
+ // We'll turn it back on again the second time
+ // through which will either be in a child process,
+ // or a single-process script which is switching
+ // configurations.
$this->persistent = (php_sapi_name() == 'cli') ? false : true;
}
$this->_ensureConn();
+ self::$cacheInitialized = true;
return true;
}
@@ -122,6 +135,24 @@ class MemcachePlugin extends Plugin
}
/**
+ * Atomically increment an existing numeric key value.
+ * Existing expiration time will not be changed.
+ *
+ * @param string &$key in; Key to use for lookups
+ * @param int &$step in; Amount to increment (default 1)
+ * @param mixed &$value out; Incremented value, or false if key not set.
+ *
+ * @return boolean hook success
+ */
+ function onStartCacheIncrement(&$key, &$step, &$value)
+ {
+ $this->_ensureConn();
+ $value = $this->_conn->increment($key, $step);
+ Event::handle('EndCacheIncrement', array($key, $step, $value));
+ return false;
+ }
+
+ /**
* Delete a value associated with a key
*
* @param string &$key in; Key to lookup