forked from GNUsocial/gnu-social
A queuehandler for blowing caches offline
We add a queuehandler for blowing the memcached caches off-line. This should speed up the processing of new notices.
This commit is contained in:
parent
0dd90461cd
commit
640628de2d
@ -207,7 +207,11 @@ class Notice extends Memcached_DataObject
|
|||||||
# XXX: someone clever could prepend instead of clearing the cache
|
# XXX: someone clever could prepend instead of clearing the cache
|
||||||
|
|
||||||
if (common_config('memcached', 'enabled')) {
|
if (common_config('memcached', 'enabled')) {
|
||||||
$notice->blowCaches();
|
if (common_config('queues', 'enabled')) {
|
||||||
|
$notice->blowAuthorCaches();
|
||||||
|
} else {
|
||||||
|
$notice->blowCaches();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return $notice;
|
return $notice;
|
||||||
@ -271,6 +275,25 @@ class Notice extends Memcached_DataObject
|
|||||||
$this->blowGroupCache($blowLast);
|
$this->blowGroupCache($blowLast);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function blowAuthorCaches($blowLast=false)
|
||||||
|
{
|
||||||
|
// Clear the user's cache
|
||||||
|
$cache = common_memcache();
|
||||||
|
if ($cache) {
|
||||||
|
$user = User::staticGet($this->profile_id);
|
||||||
|
if (!empty($user)) {
|
||||||
|
$cache->delete(common_cache_key('user:notices_with_friends:' . $user->id));
|
||||||
|
if ($blowLast) {
|
||||||
|
$cache->delete(common_cache_key('user:notices_with_friends:' . $user->id . ';last'));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
$user->free();
|
||||||
|
unset($user);
|
||||||
|
}
|
||||||
|
$this->blowNoticeCache($blowLast);
|
||||||
|
$this->blowPublicCache($blowLast);
|
||||||
|
}
|
||||||
|
|
||||||
function blowGroupCache($blowLast=false)
|
function blowGroupCache($blowLast=false)
|
||||||
{
|
{
|
||||||
$cache = common_memcache();
|
$cache = common_memcache();
|
||||||
|
14
lib/util.php
14
lib/util.php
@ -879,7 +879,17 @@ function common_broadcast_notice($notice, $remote=false)
|
|||||||
|
|
||||||
function common_enqueue_notice($notice)
|
function common_enqueue_notice($notice)
|
||||||
{
|
{
|
||||||
foreach (array('jabber', 'omb', 'sms', 'public', 'twitter', 'facebook', 'ping') as $transport) {
|
$transports = array('omb', 'sms', 'twitter', 'facebook', 'ping');
|
||||||
|
|
||||||
|
if (common_config('xmpp', 'enabled')) {
|
||||||
|
$transports = array_merge($transports, array('jabber', 'public'));
|
||||||
|
}
|
||||||
|
|
||||||
|
if (common_config('memcached', 'enabled')) {
|
||||||
|
$transports[] = 'memcached';
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach ($transports as $transport) {
|
||||||
$qi = new Queue_item();
|
$qi = new Queue_item();
|
||||||
$qi->notice_id = $notice->id;
|
$qi->notice_id = $notice->id;
|
||||||
$qi->transport = $transport;
|
$qi->transport = $transport;
|
||||||
@ -1332,7 +1342,7 @@ function common_compatible_license($from, $to)
|
|||||||
*/
|
*/
|
||||||
function common_database_tablename($tablename)
|
function common_database_tablename($tablename)
|
||||||
{
|
{
|
||||||
|
|
||||||
if(common_config('db','quote_identifiers')) {
|
if(common_config('db','quote_identifiers')) {
|
||||||
$tablename = '"'. $tablename .'"';
|
$tablename = '"'. $tablename .'"';
|
||||||
}
|
}
|
||||||
|
58
scripts/memcachedqueuehandler.php
Normal file
58
scripts/memcachedqueuehandler.php
Normal file
@ -0,0 +1,58 @@
|
|||||||
|
#!/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 MemcachedQueueHandler extends QueueHandler
|
||||||
|
{
|
||||||
|
function transport()
|
||||||
|
{
|
||||||
|
return 'memcached';
|
||||||
|
}
|
||||||
|
|
||||||
|
function handle_notice($notice)
|
||||||
|
{
|
||||||
|
// XXX: fork here
|
||||||
|
common_log(LOG_INFO, "Blowing memcached for $notice->id\n";
|
||||||
|
$notice->blowCaches();
|
||||||
|
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 MemcachedQueueHandler($resource);
|
||||||
|
|
||||||
|
$handler->runOnce();
|
@ -24,7 +24,8 @@ DIR=`dirname $0`
|
|||||||
|
|
||||||
for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
|
for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php \
|
||||||
xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
|
xmppconfirmhandler.php smsqueuehandler.php ombqueuehandler.php \
|
||||||
twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php; do
|
twitterqueuehandler.php facebookqueuehandler.php pingqueuehandler.php \
|
||||||
|
memcachedqueuehandler.php; do
|
||||||
|
|
||||||
echo -n "Starting $f...";
|
echo -n "Starting $f...";
|
||||||
php $DIR/$f
|
php $DIR/$f
|
||||||
|
@ -24,7 +24,7 @@ SDIR=`dirname $0`
|
|||||||
DIR=`php $SDIR/getpiddir.php`
|
DIR=`php $SDIR/getpiddir.php`
|
||||||
|
|
||||||
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
|
for f in jabberhandler ombhandler publichandler smshandler pinghandler \
|
||||||
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler ; do
|
xmppconfirmhandler xmppdaemon twitterhandler facebookhandler memcachedhandler; do
|
||||||
|
|
||||||
FILES="$DIR/$f.*.pid"
|
FILES="$DIR/$f.*.pid"
|
||||||
for ff in "$FILES" ; do
|
for ff in "$FILES" ; do
|
||||||
|
Loading…
Reference in New Issue
Block a user