GNUsocial
/
gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Add UnQueueManager for immediate handling 

Perhaps it's a little precious, but I took out the switches in
util.php to determine what's supposed to be sent when, and made
a queuemanager class that will just do things when they're supposed to
be done.
This commit is contained in:
Evan Prodromou 2009-07-01 11:34:12 -04:00
parent 7b66a12913
commit e0bf8ad95b
3 changed files with 112 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/queuemanager.php
View File

@ -36,9 +36,15 @@ class QueueManager
{
if (empty(self::$qm)) {
$type = common_config('queue', 'sub');
if (Event::handle('StartNewQueueManager', array(&self::$qm))) {
if (Event::handle('StartNewQueueManager', array($type, &self::$qm))) {
$enabled = common_config('queue', 'enabled');
$type = common_config('queue', 'sub');
if (!$enabled) {
// does everything immediately
return new UnQueueManager();
}
switch ($type) {
case 'db':

85
lib/unqueuemanager.php Normal file
View File

@ -0,0 +1,85 @@
<?php
/**
* Laconica, the distributed open-source microblogging tool
*
* A queue manager interface for just doing things immediately
*
* PHP version 5
*
* LICENCE: This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @category QueueManager
* @package Laconica
* @author Evan Prodromou <evan@controlyourself.ca>
* @author Sarven Capadisli <csarven@controlyourself.ca>
* @copyright 2009 Control Yourself, Inc.
* @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
* @link http://laconi.ca/
*/
class UnQueueManager
{
function enqueue($object, $queue)
{
$notice = $object;
switch ($queue)
{
case 'omb':
if ($this->_isLocal($notice)) {
require_once(INSTALLDIR.'/lib/omb.php');
omb_broadcast_remote_subscribers($notice);
}
break;
case 'public':
if ($this->_isLocal($notice)) {
require_once(INSTALLDIR.'/lib/jabber.php');
jabber_public_notice($notice);
}
break;
case 'twitter':
if ($this->_isLocal($notice)) {
broadcast_twitter($notice);
}
break;
case 'facebook':
if ($this->_isLocal($notice)) {
require_once INSTALLDIR . '/lib/facebookutil.php';
return facebookBroadcastNotice($notice);
}
break;
case 'ping':
if ($this->_isLocal($notice)) {
require_once INSTALLDIR . '/lib/ping.php';
return ping_broadcast_notice($notice);
}
case 'sms':
require_once(INSTALLDIR.'/lib/mail.php');
mail_broadcast_notice_sms($notice);
break;
case 'jabber':
require_once(INSTALLDIR.'/lib/jabber.php');
jabber_broadcast_notice($notice);
break;
default:
throw ServerException("UnQueueManager: Unknown queue: $type");
}
}
function _isLocal($notice)
{
return ($notice->is_local == NOTICE_LOCAL_PUBLIC ||
$notice->is_local == NOTICE_LOCAL_NONPUBLIC);
}
}

91
lib/util.php
View File

@ -861,88 +861,35 @@ function common_redirect($url, $code=307)
function common_broadcast_notice($notice, $remote=false)
{
if (common_config('queue', 'enabled')) {
// Do it later!
return common_enqueue_notice($notice);
} else {
return common_real_broadcast($notice, $remote);
}
return common_enqueue_notice($notice);
}
// Stick the notice on the queue
function common_enqueue_notice($notice)
{
$transports = array('omb', 'sms', 'public', 'twitter', 'facebook', 'ping');
static $localTransports = array('omb',
'public',
'twitter',
'facebook',
'ping');
static $allTransports = array('sms', 'jabber');
if (common_config('xmpp', 'enabled'))
$transports = $allTransports;
if ($notice->is_local == NOTICE_LOCAL_PUBLIC ||
$notice->is_local == NOTICE_LOCAL_NONPUBLIC) {
$transports = array_merge($transports, $localTransports);
}
$qm = QueueManager::get();
foreach ($transports as $transport)
{
$transports[] = 'jabber';
$qm->enqueue($notice, $transport);
}
if (common_config('queue','subsystem') == 'stomp') {
common_enqueue_notice_stomp($notice, $transports);
}
else {
common_enqueue_notice_db($notice, $transports);
}
return $result;
}
function common_enqueue_notice_db($notice, $transports)
{
// in any other case, 'internal'
foreach ($transports as $transport) {
common_enqueue_notice_transport($notice, $transport);
}
}
function common_enqueue_notice_transport($notice, $transport)
{
}
function common_real_broadcast($notice, $remote=false)
{
$success = true;
if (!$remote) {
// Make sure we have the OMB stuff
require_once(INSTALLDIR.'/lib/omb.php');
$success = omb_broadcast_remote_subscribers($notice);
if (!$success) {
common_log(LOG_ERR, 'Error in OMB broadcast for notice ' . $notice->id);
}
}
if ($success) {
require_once(INSTALLDIR.'/lib/jabber.php');
$success = jabber_broadcast_notice($notice);
if (!$success) {
common_log(LOG_ERR, 'Error in jabber broadcast for notice ' . $notice->id);
}
}
if ($success) {
require_once(INSTALLDIR.'/lib/mail.php');
$success = mail_broadcast_notice_sms($notice);
if (!$success) {
common_log(LOG_ERR, 'Error in sms broadcast for notice ' . $notice->id);
}
}
if ($success) {
$success = jabber_public_notice($notice);
if (!$success) {
common_log(LOG_ERR, 'Error in public broadcast for notice ' . $notice->id);
}
}
if ($success) {
$success = broadcast_twitter($notice);
if (!$success) {
common_log(LOG_ERR, 'Error in Twitter broadcast for notice ' . $notice->id);
}
}
// XXX: Do a real-time FB broadcast here?
// XXX: broadcast notices to other IM
return $success;
return true;
}
function common_broadcast_profile($profile)