summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-01-28 16:55:37 -0800
committerBrion Vibber <brion@pobox.com>2010-01-28 16:55:37 -0800
commitda34de74fece355785710bc4ff0bab03389a2877 (patch)
treec6830f8edcae1cc508fd7cf32a1f6e6ff59ba580
parent63a0e84a8b94d84b106431b648ec76e2537ab9c6 (diff)
parentd13d73c5630244963f0c3bd9db68dd6c6451821a (diff)
Merge branch 'testing'
-rw-r--r--actions/showstream.php17
-rw-r--r--classes/Notice.php35
-rw-r--r--lib/applicationeditform.php2
-rw-r--r--lib/common.php7
-rw-r--r--lib/default.php1
-rw-r--r--lib/liberalstomp.php24
-rw-r--r--lib/noticelist.php5
-rw-r--r--lib/stompqueuemanager.php354
-rw-r--r--plugins/Facebook/facebookaction.php4
-rw-r--r--plugins/Facebook/facebookapp.js (renamed from js/facebookapp.js)0
-rw-r--r--plugins/MemcachePlugin.php5
-rw-r--r--theme/base/css/display.css11
-rw-r--r--theme/default/css/display.css9
-rw-r--r--theme/identica/css/display.css9
14 files changed, 358 insertions, 125 deletions
diff --git a/actions/showstream.php b/actions/showstream.php
index 90ff67073..c52919386 100644
--- a/actions/showstream.php
+++ b/actions/showstream.php
@@ -291,23 +291,6 @@ class ProfileNoticeListItem extends NoticeListItem
$this->out->elementStart('span', 'repeat');
- $this->out->elementStart('a', $attrs);
-
- $avatar = $this->profile->getAvatar(AVATAR_MINI_SIZE);
-
- $this->out->element('img', array('src' => ($avatar) ?
- $avatar->displayUrl() :
- Avatar::defaultImage(AVATAR_MINI_SIZE),
- 'class' => 'avatar photo',
- 'width' => AVATAR_MINI_SIZE,
- 'height' => AVATAR_MINI_SIZE,
- 'alt' =>
- ($this->profile->fullname) ?
- $this->profile->fullname :
- $this->profile->nickname));
-
- $this->out->elementEnd('a');
-
$text_link = XMLStringer::estring('a', $attrs, $this->profile->nickname);
$this->out->raw(sprintf(_('Repeat of %s'), $text_link));
diff --git a/classes/Notice.php b/classes/Notice.php
index 90e3e76ef..a60dd5bcd 100644
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -326,13 +326,7 @@ class Notice extends Memcached_DataObject
# XXX: someone clever could prepend instead of clearing the cache
$notice->blowOnInsert();
- if (common_config('queue', 'inboxes')) {
- $qm = QueueManager::get();
- $qm->enqueue($notice, 'distrib');
- } else {
- $handler = new DistribQueueHandler();
- $handler->handle($notice);
- }
+ $notice->distribute();
return $notice;
}
@@ -1447,4 +1441,31 @@ class Notice extends Memcached_DataObject
$gi->free();
}
+
+ function distribute()
+ {
+ if (common_config('queue', 'inboxes')) {
+ // If there's a failure, we want to _force_
+ // distribution at this point.
+ try {
+ $qm = QueueManager::get();
+ $qm->enqueue($this, 'distrib');
+ } catch (Exception $e) {
+ // If the exception isn't transient, this
+ // may throw more exceptions as DQH does
+ // its own enqueueing. So, we ignore them!
+ try {
+ $handler = new DistribQueueHandler();
+ $handler->handle($this);
+ } catch (Exception $e) {
+ common_log(LOG_ERR, "emergency redistribution resulted in " . $e->getMessage());
+ }
+ // Re-throw so somebody smarter can handle it.
+ throw $e;
+ }
+ } else {
+ $handler = new DistribQueueHandler();
+ $handler->handle($this);
+ }
+ }
}
diff --git a/lib/applicationeditform.php b/lib/applicationeditform.php
index 6f03a9bed..9b7d05861 100644
--- a/lib/applicationeditform.php
+++ b/lib/applicationeditform.php
@@ -168,8 +168,6 @@ class ApplicationEditForm extends Form
$this->access_type = '';
}
- $this->out->hidden('token', common_session_token());
-
$this->out->elementStart('ul', 'form_data');
$this->out->elementStart('li', array('id' => 'application_icon'));
diff --git a/lib/common.php b/lib/common.php
index b4e4a653c..b482464aa 100644
--- a/lib/common.php
+++ b/lib/common.php
@@ -115,6 +115,10 @@ function __autoload($cls)
require_once 'Validate.php';
require_once 'markdown.php';
+// XXX: other formats here
+
+define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
+
require_once INSTALLDIR.'/lib/util.php';
require_once INSTALLDIR.'/lib/action.php';
require_once INSTALLDIR.'/lib/mail.php';
@@ -136,6 +140,3 @@ try {
exit;
}
-// XXX: other formats here
-
-define('NICKNAME_FMT', VALIDATE_NUM.VALIDATE_ALPHA_LOWER);
diff --git a/lib/default.php b/lib/default.php
index 8de8b1097..c01508695 100644
--- a/lib/default.php
+++ b/lib/default.php
@@ -85,6 +85,7 @@ $default =
'stomp_username' => null,
'stomp_password' => null,
'stomp_persistent' => true, // keep items across queue server restart, if persistence is enabled
+ 'stomp_manual_failover' => true, // if multiple servers are listed, treat them as separate (enqueue on one randomly, listen on all)
'monitor' => null, // URL to monitor ping endpoint (work in progress)
'softlimit' => '90%', // total size or % of memory_limit at which to restart queue threads gracefully
'debug_memory' => false, // true to spit memory usage to log
diff --git a/lib/liberalstomp.php b/lib/liberalstomp.php
index c9233843a..3d38953fd 100644
--- a/lib/liberalstomp.php
+++ b/lib/liberalstomp.php
@@ -34,6 +34,22 @@ class LiberalStomp extends Stomp
}
/**
+ * Return the host we're currently connected to.
+ *
+ * @return string
+ */
+ function getServer()
+ {
+ $idx = $this->_currentHost;
+ if ($idx >= 0) {
+ $host = $this->_hosts[$idx];
+ return "$host[0]:$host[1]";
+ } else {
+ return '[unconnected]';
+ }
+ }
+
+ /**
* Make socket connection to the server
* We also set the stream to non-blocking mode, since we'll be
* select'ing to wait for updates. In blocking mode it seems
@@ -71,10 +87,12 @@ class LiberalStomp extends Stomp
// @fixme this sometimes hangs in blocking mode...
// shouldn't we have been idle until we found there's more data?
$read = fread($this->_socket, $rb);
- if ($read === false) {
- $this->_reconnect();
+ if ($read === false || ($read === '' && feof($this->_socket))) {
+ // @fixme possibly attempt an auto reconnect as old code?
+ throw new StompException("Error reading");
+ //$this->_reconnect();
// @fixme this will lose prior items
- return $this->readFrames();
+ //return $this->readFrames();
}
$data .= $read;
if (strpos($data, "\x00") !== false) {
diff --git a/lib/noticelist.php b/lib/noticelist.php
index 78abf34a7..85c169716 100644
--- a/lib/noticelist.php
+++ b/lib/noticelist.php
@@ -555,11 +555,8 @@ class NoticeListItem extends Widget
$this->out->raw(_('Repeated by'));
- $avatar = $repeater->getAvatar(AVATAR_MINI_SIZE);
-
$this->out->elementStart('a', $attrs);
-
- $this->out->element('span', 'nickname', $repeater->nickname);
+ $this->out->element('span', 'fn nickname', $repeater->nickname);
$this->out->elementEnd('a');
$this->out->elementEnd('span');
diff --git a/lib/stompqueuemanager.php b/lib/stompqueuemanager.php
index 4e2b58602..ec150bbb6 100644
--- a/lib/stompqueuemanager.php
+++ b/lib/stompqueuemanager.php
@@ -29,28 +29,37 @@
*/
require_once 'Stomp.php';
+require_once 'Stomp/Exception.php';
class StompQueueManager extends QueueManager
{
- var $server = null;
- var $username = null;
- var $password = null;
- var $base = null;
- var $con = null;
+ protected $servers;
+ protected $username;
+ protected $password;
+ protected $base;
protected $control;
+
+ protected $useTransactions = true;
protected $sites = array();
protected $subscriptions = array();
- protected $useTransactions = true;
- protected $transaction = null;
- protected $transactionCount = 0;
+ protected $cons = array(); // all open connections
+ protected $disconnect = array();
+ protected $transaction = array();
+ protected $transactionCount = array();
+ protected $defaultIdx = 0;
function __construct()
{
parent::__construct();
- $this->server = common_config('queue', 'stomp_server');
+ $server = common_config('queue', 'stomp_server');
+ if (is_array($server)) {
+ $this->servers = $server;
+ } else {
+ $this->servers = array($server);
+ }
$this->username = common_config('queue', 'stomp_username');
$this->password = common_config('queue', 'stomp_password');
$this->base = common_config('queue', 'queue_basename');
@@ -99,9 +108,9 @@ class StompQueueManager extends QueueManager
$message .= ':' . $param;
}
$this->_connect();
- $result = $this->con->send($this->control,
- $message,
- array ('created' => common_sql_now()));
+ $result = $this->_send($this->control,
+ $message,
+ array ('created' => common_sql_now()));
if ($result) {
$this->_log(LOG_INFO, "Sent control ping to queue daemons: $message");
return true;
@@ -166,29 +175,59 @@ class StompQueueManager extends QueueManager
/**
* Saves a notice object reference into the queue item table.
* @return boolean true on success
+ * @throws StompException on connection or send error
*/
public function enqueue($object, $queue)
{
+ $this->_connect();
+ return $this->_doEnqueue($object, $queue, $this->defaultIdx);
+ }
+
+ /**
+ * Saves a notice object reference into the queue item table
+ * on the given connection.
+ *
+ * @return boolean true on success
+ * @throws StompException on connection or send error
+ */
+ protected function _doEnqueue($object, $queue, $idx)
+ {
$msg = $this->encode($object);
$rep = $this->logrep($object);
- $this->_connect();
-
$props = array('created' => common_sql_now());
- if (common_config('queue', 'stomp_persistent')) {
+ if ($this->isPersistent($queue)) {
$props['persistent'] = 'true';
}
- $result = $this->con->send($this->queueName($queue),
- $msg, // BODY of the message
- $props);
+
+ $con = $this->cons[$idx];
+ $host = $con->getServer();
+ $result = $con->send($this->queueName($queue), $msg, $props);
if (!$result) {
- common_log(LOG_ERR, "Error sending $rep to $queue queue");
+ common_log(LOG_ERR, "Error sending $rep to $queue queue on $host");
return false;
}
- common_log(LOG_DEBUG, "complete remote queueing $rep for $queue");
+ common_log(LOG_DEBUG, "complete remote queueing $rep for $queue on $host");
$this->stats('enqueued', $queue);
+ return true;
+ }
+
+ /**
+ * Determine whether messages to this queue should be marked as persistent.
+ * Actual persistent storage depends on the queue server's configuration.
+ * @param string $queue
+ * @return bool
+ */
+ protected function isPersistent($queue)
+ {
+ $mode = common_config('queue', 'stomp_persistent');
+ if (is_array($mode)) {
+ return in_array($queue, $mode);
+ } else {
+ return (bool)$mode;
+ }
}
/**
@@ -199,7 +238,29 @@ class StompQueueManager extends QueueManager
*/
public function getSockets()
{
- return array($this->con->getSocket());
+ $sockets = array();
+ foreach ($this->cons as $con) {
+ if ($con) {
+ $sockets[] = $con->getSocket();
+ }
+ }
+ return $sockets;
+ }
+
+ /**
+ * Get the Stomp connection object associated with the given socket.
+ * @param resource $socket
+ * @return int index into connections list
+ * @throws Exception
+ */
+ protected function connectionFromSocket($socket)
+ {
+ foreach ($this->cons as $i => $con) {
+ if ($con && $con->getSocket() === $socket) {
+ return $i;
+ }
+ }
+ throw new Exception(__CLASS__ . " asked to read from unrecognized socket");
}
/**
@@ -211,27 +272,56 @@ class StompQueueManager extends QueueManager
*/
public function handleInput($socket)
{
- assert($socket === $this->con->getSocket());
+ $idx = $this->connectionFromSocket($socket);
+ $con = $this->cons[$idx];
+ $host = $con->getServer();
+
$ok = true;
- $frames = $this->con->readFrames();
+ try {
+ $frames = $con->readFrames();
+ } catch (StompException $e) {
+ common_log(LOG_ERR, "Lost connection to $host: " . $e->getMessage());
+ $this->cons[$idx] = null;
+ $this->transaction[$idx] = null;
+ $this->disconnect[$idx] = time();
+ return false;
+ }
foreach ($frames as $frame) {
$dest = $frame->headers['destination'];
if ($dest == $this->control) {
- if (!$this->handleControlSignal($frame)) {
+ if (!$this->handleControlSignal($idx, $frame)) {
// We got a control event that requests a shutdown;
// close out and stop handling anything else!
break;
}
} else {
- $ok = $ok && $this->handleItem($frame);
+ $ok = $ok && $this->handleItem($idx, $frame);
}
}
return $ok;
}
/**
+ * Attempt to reconnect in background if we lost a connection.
+ */
+ function idle()
+ {
+ $now = time();
+ foreach ($this->cons as $idx => $con) {
+ if (empty($con)) {
+ $age = $now - $this->disconnect[$idx];
+ if ($age >= 60) {
+ $this->_reconnect($idx);
+ }
+ }
+ }
+ return true;
+ }
+
+ /**
* Initialize our connection and subscribe to all the queues
- * we're going to need to handle...
+ * we're going to need to handle... If multiple queue servers
+ * are configured for failover, we'll listen to all of them.
*
* Side effects: in multi-site mode, may reset site configuration.
*
@@ -241,10 +331,14 @@ class StompQueueManager extends QueueManager
public function start($master)
{
parent::start($master);
- $this->_connect();
+ $this->_connectAll();
common_log(LOG_INFO, "Subscribing to $this->control");
- $this->con->subscribe($this->control);
+ foreach ($this->cons as $con) {
+ if ($con) {
+ $con->subscribe($this->control);
+ }
+ }
if ($this->sites) {
foreach ($this->sites as $server) {
StatusNet::init($server);
@@ -253,7 +347,11 @@ class StompQueueManager extends QueueManager
} else {
$this->doSubscribe();
}
- $this->begin();
+ foreach ($this->cons as $i => $con) {
+ if ($con) {
+ $this->begin($i);
+ }
+ }
return true;
}
@@ -268,8 +366,12 @@ class StompQueueManager extends QueueManager
{
// If there are any outstanding delivered messages we haven't processed,
// free them for another thread to take.
- $this->rollback();
- $this->con->unsubscribe($this->control);
+ foreach ($this->cons as $i => $con) {
+ if ($con) {
+ $this->rollback($i);
+ $con->unsubscribe($this->control);
+ }
+ }
if ($this->sites) {
foreach ($this->sites as $server) {
StatusNet::init($server);
@@ -291,24 +393,107 @@ class StompQueueManager extends QueueManager
}
/**
- * Lazy open connection to Stomp queue server.
+ * Lazy open a single connection to Stomp queue server.
+ * If multiple servers are configured, we let the Stomp client library
+ * worry about finding a working connection among them.
*/
protected function _connect()
{
- if (empty($this->con)) {
- $this->_log(LOG_INFO, "Connecting to '$this->server' as '$this->username'...");
- $this->con = new LiberalStomp($this->server);
-
- if ($this->con->connect($this->username, $this->password)) {
- $this->_log(LOG_INFO, "Connected.");
+ if (empty($this->cons)) {
+ $list = $this->servers;
+ if (count($list) > 1) {
+ shuffle($list); // Randomize to spread load
+ $url = 'failover://(' . implode(',', $list) . ')';
} else {
- $this->_log(LOG_ERR, 'Failed to connect to queue server');
- throw new ServerException('Failed to connect to queue server');
+ $url = $list[0];
}
+ $con = $this->_doConnect($url);
+ $this->cons = array($con);
+ $this->transactionCount = array(0);
+ $this->transaction = array(null);
+ $this->disconnect = array(null);
}
}
/**
+ * Lazy open connections to all Stomp servers, if in manual failover
+ * mode. This means the queue servers don't speak to each other, so
+ * we have to listen to all of them to make sure we get all events.
+ */
+ protected function _connectAll()
+ {
+ if (!common_config('queue', 'stomp_manual_failover')) {
+ return $this->_connect();
+ }
+ if (empty($this->cons)) {
+ $this->cons = array();
+ $this->transactionCount = array();
+ $this->transaction = array();
+ foreach ($this->servers as $idx => $server) {
+ try {
+ $this->cons[] = $this->_doConnect($server);
+ $this->disconnect[] = null;
+ } catch (Exception $e) {
+ // s'okay, we'll live
+ $this->cons[] = null;
+ $this->disconnect[] = time();
+ }
+ $this->transactionCount[] = 0;
+ $this->transaction[] = null;
+ }
+ if (empty($this->cons)) {
+ throw new ServerException("No queue servers reachable...");
+ return false;
+ }
+ }
+ }
+
+ protected function _reconnect($idx)
+ {
+ try {
+ $con = $this->_doConnect($this->servers[$idx]);
+ } catch (Exception $e) {
+ $this->_log(LOG_ERR, $e->getMessage());
+ $con = null;
+ }
+ if ($con) {
+ $this->cons[$idx] = $con;
+ $this->disconnect[$idx] = null;
+
+ // now we have to listen to everything...
+ // @fixme refactor this nicer. :P
+ $host = $con->getServer();
+ $this->_log(LOG_INFO, "Resubscribing to $this->control on $host");
+ $con->subscribe($this->control);
+ foreach ($this->subscriptions as $site => $queues) {
+ foreach ($queues as $queue) {
+ $this->_log(LOG_INFO, "Resubscribing to $queue on $host");
+ $con->subscribe($queue);
+ }
+ }
+ $this->begin($idx);
+ } else {
+ // Try again later...
+ $this->disconnect[$idx] = time();
+ }
+ }
+
+ protected function _doConnect($server)
+ {
+ $this->_log(LOG_INFO, "Connecting to '$server' as '$this->username'...");
+ $con = new LiberalStomp($server);
+
+ if ($con->connect($this->username, $this->password)) {
+ $this->_log(LOG_INFO, "Connected.");
+ } else {
+ $this->_log(LOG_ERR, 'Failed to connect to queue server');
+ throw new ServerException('Failed to connect to queue server');
+ }
+
+ return $con;
+ }
+
+ /**
* Subscribe to all enabled notice queues for the current site.
*/
protected function doSubscribe()
@@ -319,7 +504,11 @@ class StompQueueManager extends QueueManager
$rawqueue = $this->queueName($queue);
$this->subscriptions[$site][$queue] = $rawqueue;
$this->_log(LOG_INFO, "Subscribing to $rawqueue");
- $this->con->subscribe($rawqueue);
+ foreach ($this->cons as $con) {
+ if ($con) {
+ $con->subscribe($rawqueue);
+ }
+ }
}
}
@@ -333,7 +522,11 @@ class StompQueueManager extends QueueManager
if (!empty($this->subscriptions[$site])) {
foreach ($this->subscriptions[$site] as $queue => $rawqueue) {
$this->_log(LOG_INFO, "Unsubscribing from $rawqueue");
- $this->con->unsubscribe($rawqueue);
+ foreach ($this->cons as $con) {
+ if ($con) {
+ $con->unsubscribe($rawqueue);
+ }
+ }
unset($this->subscriptions[$site][$queue]);
}
}
@@ -348,27 +541,31 @@ class StompQueueManager extends QueueManager
* Side effects: in multi-site mode, may reset site configuration to
* match the site that queued the event.
*
+ * @param int $idx connection index
* @param StompFrame $frame
* @return bool
*/
- protected function handleItem($frame)
+ protected function handleItem($idx, $frame)
{
+ $this->defaultIdx = $idx;
+
list($site, $queue) = $this->parseDestination($frame->headers['destination']);
if ($site != $this->currentSite()) {
$this->stats('switch');
StatusNet::init($site);
}
+ $host = $this->cons[$idx]->getServer();
if (is_numeric($frame->body)) {
$id = intval($frame->body);
- $info = "notice $id posted at {$frame->headers['created']} in queue $queue";
+ $info = "notice $id posted at {$frame->headers['created']} in queue $queue from $host";
$notice = Notice::staticGet('id', $id);
if (empty($notice)) {
$this->_log(LOG_WARNING, "Skipping missing $info");
- $this->ack($frame);
- $this->commit();
- $this->begin();
+ $this->ack($idx, $frame);
+ $this->commit($idx);
+ $this->begin($idx);
$this->stats('badnotice', $queue);
return false;
}
@@ -376,16 +573,16 @@ class StompQueueManager extends QueueManager
$item = $notice;
} else {
// @fixme should we serialize, or json, or what here?
- $info = "string posted at {$frame->headers['created']} in queue $queue";
+ $info = "string posted at {$frame->headers['created']} in queue $queue from $host";
$item = $frame->body;
}
$handler = $this->getHandler($queue);
if (!$handler) {
$this->_log(LOG_ERR, "Missing handler class; skipping $info");
- $this->ack($frame);
- $this->commit();
- $this->begin();
+ $this->ack($idx, $frame);
+ $this->commit($idx);
+ $this->begin($idx);
$this->stats('badhandler', $queue);
return false;
}
@@ -397,18 +594,18 @@ class StompQueueManager extends QueueManager
// FIXME we probably shouldn't have to do
// this kind of queue management ourselves;
// if we don't ack, it should resend...
- $this->ack($frame);
+ $this->ack($idx, $frame);
$this->enqueue($item, $queue);
- $this->commit();
- $this->begin();
+ $this->commit($idx);
+ $this->begin($idx);
$this->stats('requeued', $queue);
return false;
}
$this->_log(LOG_INFO, "Successfully handled $info");
- $this->ack($frame);
- $this->commit();
- $this->begin();
+ $this->ack($idx, $frame);
+ $this->commit($idx);
+ $this->begin($idx);
$this->stats('handled', $queue);
return true;
}
@@ -416,10 +613,11 @@ class StompQueueManager extends QueueManager
/**
* Process a control signal broadcast.
*
+ * @param int $idx connection index
* @param array $frame Stomp frame
* @return bool true to continue; false to stop further processing.
*/
- protected function handleControlSignal($frame)
+ protected function handleControlSignal($idx, $frame)
{
$message = trim($frame->body);
if (strpos($message, ':') !== false) {
@@ -443,9 +641,9 @@ class StompQueueManager extends QueueManager
$this->_log(LOG_ERR, "Ignoring unrecognized control message: $message");
}
- $this->ack($frame);
- $this->commit();
- $this->begin();
+ $this->ack($idx, $frame);
+ $this->commit($idx);
+ $this->begin($idx);
return $shutdown;
}
@@ -522,47 +720,49 @@ class StompQueueManager extends QueueManager
common_log($level, 'StompQueueManager: '.$msg);
}
- protected function begin()
+ protected function begin($idx)
{
if ($this->useTransactions) {
- if ($this->transaction) {
+ if (!empty($this->transaction[$idx])) {
throw new Exception("Tried to start transaction in the middle of a transaction");
}
- $this->transactionCount++;
- $this->transaction = $this->master->id . '-' . $this->transactionCount . '-' . time();
- $this->con->begin($this->transaction);
+ $this->transactionCount[$idx]++;
+ $this->transaction[$idx] = $this->master->id . '-' . $this->transactionCount[$idx] . '-' . time();
+ $this->cons[$idx]->begin($this->transaction[$idx]);
}
}
- protected function ack($frame)
+ protected function ack($idx, $frame)
{
if ($this->useTransactions) {
- if (!$this->transaction) {
+ if (empty($this->transaction[$idx])) {
throw new Exception("Tried to ack but not in a transaction");
}
+ $this->cons[$idx]->ack($frame, $this->transaction[$idx]);
+ } else {
+ $this->cons[$idx]->ack($frame);
}
- $this->con->ack($frame, $this->transaction);
}
- protected function commit()
+ protected function commit($idx)
{
if ($this->useTransactions) {
- if (!$this->transaction) {
+ if (empty($this->transaction[$idx])) {
throw new Exception("Tried to commit but not in a transaction");
}
- $this->con->commit($this->transaction);
- $this->transaction = null;
+ $this->cons[$idx]->commit($this->transaction[$idx]);
+ $this->transaction[$idx] = null;
}
}
- protected function rollback()
+ protected function rollback($idx)
{
if ($this->useTransactions) {
- if (!$this->transaction) {
+ if (empty($this->transaction[$idx])) {
throw new Exception("Tried to rollback but not in a transaction");
}
- $this->con->commit($this->transaction);
- $this->transaction = null;
+ $this->cons[$idx]->commit($this->transaction[$idx]);
+ $this->transaction[$idx] = null;
}
}
}
diff --git a/plugins/Facebook/facebookaction.php b/plugins/Facebook/facebookaction.php
index 389e1ea81..8437a705a 100644
--- a/plugins/Facebook/facebookaction.php
+++ b/plugins/Facebook/facebookaction.php
@@ -89,7 +89,7 @@ class FacebookAction extends Action
function showScripts()
{
- $this->script('facebookapp.js');
+ $this->script(common_path('plugins/Facebook/facebookapp.js'));
}
/**
@@ -397,8 +397,6 @@ class FacebookAction extends Action
return;
}
-
-
}
}
diff --git a/js/facebookapp.js b/plugins/Facebook/facebookapp.js
index 5deb6e42b..5deb6e42b 100644
--- a/js/facebookapp.js
+++ b/plugins/Facebook/facebookapp.js
diff --git a/plugins/MemcachePlugin.php b/plugins/MemcachePlugin.php
index 8c8b8da6d..2bc4b892b 100644
--- a/plugins/MemcachePlugin.php
+++ b/plugins/MemcachePlugin.php
@@ -59,6 +59,8 @@ class MemcachePlugin extends Plugin
public $persistent = null;
+ public $defaultExpiry = 86400; // 24h
+
/**
* Initialize the plugin
*
@@ -110,6 +112,9 @@ class MemcachePlugin extends Plugin
function onStartCacheSet(&$key, &$value, &$flag, &$expiry, &$success)
{
$this->_ensureConn();
+ if ($expiry === null) {
+ $expiry = $this->defaultExpiry;
+ }
$success = $this->_conn->set($key, $value, $flag, $expiry);
Event::handle('EndCacheSet', array($key, $value, $flag,
$expiry));
diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index 65dd15990..3c51deb31 100644
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -1127,8 +1127,17 @@ top:3px;
}
.dialogbox .submit_dialogbox {
-text-indent:0;
font-weight:bold;
+text-indent:0;
+min-width:46px;
+}
+
+#wrap form.processing input.submit,
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
+cursor:wait;
+outline:none;
+text-indent:-9999px;
}
.notice-options {
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 3aebb239d..06711850f 100644
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -196,11 +196,12 @@ background-color:transparent;
}
#wrap form.processing input.submit,
-.entity_actions a.processing {
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
-cursor:wait;
-text-indent:-9999px;
-outline:none;
+}
+.notice-options .form_repeat.processing {
+background-image:none;
}
#content {
diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 2818196c2..1ac96ab5b 100644
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -196,11 +196,12 @@ background-color:transparent;
}
#wrap form.processing input.submit,
-.entity_actions a.processing {
+.entity_actions a.processing,
+.dialogbox.processing .submit_dialogbox {
background:#FFFFFF url(../../base/images/icons/icon_processing.gif) no-repeat 47% 47%;
-cursor:wait;
-text-indent:-9999px;
-outline:none;
+}
+.notice-options .form_repeat.processing {
+background-image:none;
}
#content {