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.

diff --git a/classes/Notice.php b/classes/Notice.php
index 5fa0d79a1639ddb03eba10832391500d6902f5f7..fbfeb9489920184f37fed8ef7a4b447367d89e03 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -207,7 +207,11 @@ class Notice extends Memcached_DataObject
         # XXX: someone clever could prepend instead of clearing the cache
 
         if (common_config('memcached', 'enabled')) {
-            $notice->blowCaches();
+            if (common_config('queues', 'enabled')) {
+                $notice->blowAuthorCaches();
+            } else {
+                $notice->blowCaches();
+            }
         }
 
         return $notice;
@@ -271,6 +275,25 @@ class Notice extends Memcached_DataObject
         $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)
     {
         $cache = common_memcache();

diff --git a/lib/util.php b/lib/util.php
index e0eda0114b7101e046c55df94a3cb95919550bd4..12797891cf7b7a134e6aa6da5abd10a89aff843d 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -879,7 +879,17 @@ function common_broadcast_notice($notice, $remote=false)
 
 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->notice_id = $notice->id;
         $qi->transport = $transport;
@@ -1332,7 +1342,7 @@ function common_compatible_license($from, $to)
  */
 function common_database_tablename($tablename)
 {
-  
+
   if(common_config('db','quote_identifiers')) {
       $tablename = '"'. $tablename .'"';
   }

diff --git a/scripts/memcachedqueuehandler.php b/scripts/memcachedqueuehandler.php
new file mode 100644 (file)
index 0000000..3fcebcf
--- /dev/null
+++ b/scripts/memcachedqueuehandler.php
@@ -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();

diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index c3729761d06a65f63455b76fc6df1d12e702d58a..08de6d954a0cd9f0bc344767189f1745b9f2e44c 100755 (executable)
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -24,7 +24,8 @@ DIR=`dirname $0`
 
 for f in xmppdaemon.php jabberqueuehandler.php publicqueuehandler.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...";
         php $DIR/$f

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index 2bb8f9ecb2a6d02c7b66b443c35778c17b95de72..e5a181cd12aca22cf07818b4274abada542b0443 100755 (executable)
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -24,7 +24,7 @@ SDIR=`dirname $0`
 DIR=`php $SDIR/getpiddir.php`
 
 for f in jabberhandler ombhandler publichandler smshandler pinghandler \
-        xmppconfirmhandler xmppdaemon twitterhandler facebookhandler ; do
+        xmppconfirmhandler xmppdaemon twitterhandler facebookhandler memcachedhandler; do
 
        FILES="$DIR/$f.*.pid"
        for ff in "$FILES" ; do