Add an inbox queue handler
Handle distributing a notice to multiple inboxes in a queue handler rather than in the Web action.
This commit is contained in:
parent
640628de2d
commit
aee45ea91d
|
@ -197,7 +197,10 @@ class Notice extends Memcached_DataObject
|
|||
$notice->saveTags();
|
||||
$notice->saveGroups();
|
||||
|
||||
$notice->addToInboxes();
|
||||
if (!common_config('queues', 'enabled')) {
|
||||
$notice->addToInboxes();
|
||||
}
|
||||
|
||||
$notice->query('COMMIT');
|
||||
|
||||
Event::handle('EndNoticeSave', array($notice));
|
||||
|
|
|
@ -889,6 +889,10 @@ function common_enqueue_notice($notice)
|
|||
$transports[] = 'memcached';
|
||||
}
|
||||
|
||||
if (common_config('queues', 'enabled')) {
|
||||
$transports[] = 'inbox';
|
||||
}
|
||||
|
||||
foreach ($transports as $transport) {
|
||||
$qi = new Queue_item();
|
||||
$qi->notice_id = $notice->id;
|
||||
|
|
57
scripts/inboxqueuehandler.php
Normal file
57
scripts/inboxqueuehandler.php
Normal file
|
@ -0,0 +1,57 @@
|
|||
#!/usr/bin/env php
|
||||
<?php
|
||||
/*
|
||||
* Laconica - a distributed open-source microblogging tool
|
||||
* Copyright (C) 2008,2009 Control Yourself, Inc.
|
||||
*
|
||||
* 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/>.
|
||||
*/
|
||||
|
||||
// Abort if called from a web server
|
||||
|
||||
if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
|
||||
print "This script must be run from the command line\n";
|
||||
exit();
|
||||
}
|
||||
|
||||
define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
|
||||
define('LACONICA', true);
|
||||
|
||||
require_once(INSTALLDIR . '/lib/common.php');
|
||||
|
||||
set_error_handler('common_error_handler');
|
||||
|
||||
class InboxQueueHandler extends QueueHandler
|
||||
{
|
||||
function transport()
|
||||
{
|
||||
return 'inbox';
|
||||
}
|
||||
|
||||
function handle_notice($notice)
|
||||
{
|
||||
common_log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
|
||||
$notice->addToInboxes();
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
ini_set("max_execution_time", "0");
|
||||
ini_set("max_input_time", "0");
|
||||
set_time_limit(0);
|
||||
mb_internal_encoding('UTF-8');
|
||||
|
||||
$handler = new InboxQueueHandler($resource);
|
||||
|
||||
$handler->runOnce();
|
|
@ -25,7 +25,7 @@ DIR=`dirname $0`
|
|||
for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
|
||||
xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
|
||||
twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php \
|
||||
memcachedqueuehandler.php; do
|
||||
memcachedqueuehandler.php inboxqueuehandler.php; do
|
||||
|
||||
echo -n "Starting $f...";
|
||||
php $DIR/$f
|
||||
|
|
|
@ -24,7 +24,8 @@ SDIR=`dirname $0`
|
|||
DIR=`php $SDIR/getpiddir.php`
|
||||
|
||||
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
|
||||
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler memcachedhandler; do
|
||||
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler \
|
||||
memcachedhandler inboxhandler; do
|
||||
|
||||
FILES="$DIR/$f.*.pid"
|
||||
for ff in "$FILES" ; do
|
||||
|
|
Loading…
Reference in New Issue
Block a user