eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity

Removing inbox and memcached daemon handling

Browse Source
This commit is contained in:
Evan Prodromou 2009-05-30 04:40:47 -04:00
parent 45c58c74d4
commit 76ee1fd5da
6 changed files with 6 additions and 216 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
classes/Notice.php
View File

@ -196,12 +196,8 @@ class Notice extends Memcached_DataObject
$notice->saveReplies(); $notice->saveReplies();
$notice->saveTags(); $notice->saveTags();
if (common_config('queue', 'enabled')) { $notice->addToInboxes();
$notice->addToAuthorInbox(); $notice->saveGroups();
} else {
$notice->addToInboxes();
$notice->saveGroups();
}
$notice->query('COMMIT'); $notice->query('COMMIT');
@ -211,13 +207,7 @@ class Notice extends Memcached_DataObject
# Clear the cache for subscribed users, so they'll update at next request # Clear the cache for subscribed users, so they'll update at next request
# 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')) { $notice->blowCaches();
if (common_config('queue', 'enabled')) {
$notice->blowAuthorCaches();
} else {
$notice->blowCaches();
}
}
return $notice; return $notice;
} }
@ -280,17 +270,6 @@ class Notice extends Memcached_DataObject
$this->blowGroupCache($blowLast); $this->blowGroupCache($blowLast);
} }
function blowAuthorCaches($blowLast=false)
{
// Clear the user's cache
$cache = common_memcache();
if (!empty($cache)) {
$cache->delete(common_cache_key('notice_inbox:by_user:'.$this->profile_id));
}
$this->blowNoticeCache($blowLast);
$this->blowPublicCache($blowLast);
}
function blowGroupCache($blowLast=false) function blowGroupCache($blowLast=false)
{ {
$cache = common_memcache(); $cache = common_memcache();
@ -709,33 +688,6 @@ class Notice extends Memcached_DataObject
return; return;
} }
function addToAuthorInbox()
{
$enabled = common_config('inboxes', 'enabled');
if ($enabled === true || $enabled === 'transitional') {
$user = User::staticGet('id', $this->profile_id);
if (empty($user)) {
return;
}
$inbox = new Notice_inbox();
$UT = common_config('db','type')=='pgsql'?'"user"':'user';
$qry = 'INSERT INTO notice_inbox (user_id, notice_id, created) ' .
"SELECT $UT.id, " . $this->id . ", '" . $this->created . "' " .
"FROM $UT " .
"WHERE $UT.id = " . $this->profile_id . ' ' .
'AND NOT EXISTS (SELECT user_id, notice_id ' .
'FROM notice_inbox ' .
"WHERE user_id = " . $this->profile_id . ' '.
'AND notice_id = ' . $this->id . ' )';
if ($enabled === 'transitional') {
$qry .= " AND $UT.inboxed = 1";
}
$inbox->query($qry);
}
return;
}
function saveGroups() function saveGroups()
{ {
$enabled = common_config('inboxes', 'enabled'); $enabled = common_config('inboxes', 'enabled');

13
lib/util.php
View File

@ -884,16 +884,12 @@ function common_enqueue_notice($notice)
// If inboxes are enabled, wait till inboxes are filled // If inboxes are enabled, wait till inboxes are filled
// before doing inbox-dependent broadcasts // before doing inbox-dependent broadcasts
if (common_config('inboxes', 'enabled') === true || $transports = array_merge($transports, common_post_inbox_transports());
common_config('inboxes', 'enabled') === 'transitional') {
$transports[] = 'inbox';
} else {
$transports = array_merge($transports, common_post_inbox_transports());
}
foreach ($transports as $transport) { foreach ($transports as $transport) {
common_enqueue_notice_transport($notice, $transport); common_enqueue_notice_transport($notice, $transport);
} }
return $result; return $result;
} }
@ -905,11 +901,6 @@ function common_post_inbox_transports()
$transports = array_merge($transports, array('jabber', 'public')); $transports = array_merge($transports, array('jabber', 'public'));
} }
if (common_config('memcached', 'enabled')) {
// Note: limited to 8 chars
$transports[] = 'memcache';
}
return $transports; return $transports;
} }

5
scripts/getvaliddaemons.php
View File

@ -25,7 +25,6 @@
* daemon names. * daemon names.
*/ */
# Abort if called from a web server # Abort if called from a web server
if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) { if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
print "This script must be run from the command line\n"; print "This script must be run from the command line\n";
@ -41,12 +40,8 @@ if(common_config('xmpp','enabled')) {
echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php "; echo "xmppdaemon.php jabberqueuehandler.php publicqueuehandler.php ";
echo "xmppconfirmhandler.php "; echo "xmppconfirmhandler.php ";
} }
if(common_config('memcached','enabled')) {
echo "memcachedqueuehandler.php ";
}
echo "ombqueuehandler.php "; echo "ombqueuehandler.php ";
echo "twitterqueuehandler.php "; echo "twitterqueuehandler.php ";
echo "facebookqueuehandler.php "; echo "facebookqueuehandler.php ";
echo "pingqueuehandler.php "; echo "pingqueuehandler.php ";
echo "inboxqueuehandler.php ";
echo "smsqueuehandler.php "; echo "smsqueuehandler.php ";

77
scripts/inboxqueuehandler.php
View File

@ -1,77 +0,0 @@
#!/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');
require_once(INSTALLDIR . '/lib/queuehandler.php');
set_error_handler('common_error_handler');
class InboxQueueHandler extends QueueHandler
{
function transport()
{
return 'inbox';
}
function start() {
$this->log(LOG_INFO, "Initialize inbox queue handler");
return true;
}
function handle_notice($notice)
{
$this->log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
$notice->addToInboxes();
$notice->saveGroups();
$notice->blowSubsCache();
$transports = common_post_inbox_transports();
foreach ($transports as $transport) {
common_enqueue_notice_transport($notice, $transport);
}
return true;
}
function finish() {
$this->log(LOG_INFO, "Terminating inbox queue handler");
}
}
ini_set("max_execution_time", "0");
ini_set("max_input_time", "0");
set_time_limit(0);
mb_internal_encoding('UTF-8');
$id = ($argc > 1) ? $argv[1] : null;
$handler = new InboxQueueHandler($id);
$handler->runOnce();

70
scripts/memcachedqueuehandler.php
View File

@ -1,70 +0,0 @@
#!/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');
require_once(INSTALLDIR . '/lib/queuehandler.php');
set_error_handler('common_error_handler');
class MemcachedQueueHandler extends QueueHandler
{
function transport()
{
return 'memcache';
}
function start() {
$this->log(LOG_INFO, "INITIALIZE");
return true;
}
function handle_notice($notice)
{
// XXX: fork here
$this->log(LOG_INFO, "Blowing memcached for $notice->id");
$notice->blowCaches();
return true;
}
function finish() {
}
}
ini_set("max_execution_time", "0");
ini_set("max_input_time", "0");
set_time_limit(0);
mb_internal_encoding('UTF-8');
$id = ($argc > 1) ? $argv[1] : null;
$handler = new MemcachedQueueHandler($id);
$handler->runOnce();

3
scripts/stopdaemons.sh
View File

@ -24,8 +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 \ xmppconfirmhandler xmppdaemon twitterhandler facebookhandler; do
memcachehandler inboxhandler; do
FILES="$DIR/$f.*.pid" FILES="$DIR/$f.*.pid"
for ff in "$FILES" ; do for ff in "$FILES" ; do