Add an inbox queue handler

Handle distributing a notice to multiple inboxes in a queue handler
rather than in the Web action.

diff --git a/classes/Notice.php b/classes/Notice.php
index fbfeb9489920184f37fed8ef7a4b447367d89e03..ff00f2a946b1e960a6c07fe7dd7140a8d97d08b5 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -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));

diff --git a/lib/util.php b/lib/util.php
index 12797891cf7b7a134e6aa6da5abd10a89aff843d..9b6d2941a0cd2966ef3746b63a0f15c552cc2203 100644 (file)
--- a/lib/util.php
+++ b/lib/util.php
@@ -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;

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

diff --git a/scripts/startdaemons.sh b/scripts/startdaemons.sh
index 08de6d954a0cd9f0bc344767189f1745b9f2e44c..66f9ed4e0c40ec9ec1e2dee4f9d4f852dc6f3a87 100755 (executable)
--- a/scripts/startdaemons.sh
+++ b/scripts/startdaemons.sh
@@ -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

diff --git a/scripts/stopdaemons.sh b/scripts/stopdaemons.sh
index e5a181cd12aca22cf07818b4274abada542b0443..196991de0f19e192830e45a2465043625fcba33b 100755 (executable)
--- a/scripts/stopdaemons.sh
+++ b/scripts/stopdaemons.sh
@@ -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