From aee45ea91dcec4736d8b9befe17e030b873d9226 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 05:08:48 -0400
Subject: Add an inbox queue handler

Handle distributing a notice to multiple inboxes in a queue handler
rather than in the Web action.
---
 scripts/inboxqueuehandler.php | 57 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 scripts/inboxqueuehandler.php

(limited to 'scripts/inboxqueuehandler.php')

diff --git a/scripts/inboxqueuehandler.php b/scripts/inboxqueuehandler.php
new file mode 100644
index 000000000..16e334b83
--- /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();
-- 
cgit v1.2.3-54-g00ecf


From a3e727823d01ed9fd5f440eeaf27449092309865 Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 09:52:21 +0000
Subject: some basic fixes for inbox and memcached queue handlers

---
 scripts/inboxqueuehandler.php     | 15 +++++++++++++--
 scripts/memcachedqueuehandler.php | 16 ++++++++++++++--
 2 files changed, 27 insertions(+), 4 deletions(-)
 mode change 100644 => 100755 scripts/inboxqueuehandler.php
 mode change 100644 => 100755 scripts/memcachedqueuehandler.php

(limited to 'scripts/inboxqueuehandler.php')

diff --git a/scripts/inboxqueuehandler.php b/scripts/inboxqueuehandler.php
old mode 100644
new mode 100755
index 16e334b83..c76b80389
--- a/scripts/inboxqueuehandler.php
+++ b/scripts/inboxqueuehandler.php
@@ -29,6 +29,7 @@ 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');
 
@@ -39,12 +40,20 @@ class InboxQueueHandler extends QueueHandler
         return 'inbox';
     }
 
+	function start() {
+		$this->log(LOG_INFO, "INITIALIZE");
+		return true;
+	}
+
     function handle_notice($notice)
     {
-        common_log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
+        $this->log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
         $notice->addToInboxes();
         return true;
     }
+
+	function finish() {
+	}
 }
 
 ini_set("max_execution_time", "0");
@@ -52,6 +61,8 @@ ini_set("max_input_time", "0");
 set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
-$handler = new InboxQueueHandler($resource);
+$id = ($argc > 1) ? $argv[1] : null;
+
+$handler = new InboxQueueHandler($id);
 
 $handler->runOnce();
diff --git a/scripts/memcachedqueuehandler.php b/scripts/memcachedqueuehandler.php
old mode 100644
new mode 100755
index 43231fa2c..6e819b41f
--- a/scripts/memcachedqueuehandler.php
+++ b/scripts/memcachedqueuehandler.php
@@ -29,6 +29,7 @@ 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');
 
@@ -39,13 +40,22 @@ class MemcachedQueueHandler extends QueueHandler
         return 'memcached';
     }
 
+	function start() {
+		$this->log(LOG_INFO, "INITIALIZE");
+		return true;
+	}
+
     function handle_notice($notice)
     {
         // XXX: fork here
-        common_log(LOG_INFO, "Blowing memcached for $notice->id");
+        $this->log(LOG_INFO, "Blowing memcached for $notice->id");
         $notice->blowCaches();
         return true;
     }
+
+	function finish() {
+	}
+
 }
 
 ini_set("max_execution_time", "0");
@@ -53,6 +63,8 @@ ini_set("max_input_time", "0");
 set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
-$handler = new MemcachedQueueHandler($resource);
+$id = ($argc > 1) ? $argv[1] : null;
+
+$handler = new MemcachedQueueHandler($id);
 
 $handler->runOnce();
-- 
cgit v1.2.3-54-g00ecf


From 290ae7888c4d8dbcb703920960b10bca635563ed Mon Sep 17 00:00:00 2001
From: Evan Prodromou <evan@controlyourself.ca>
Date: Thu, 23 Apr 2009 10:08:51 +0000
Subject: blow subs cache after updating inboxes

---
 scripts/inboxqueuehandler.php | 1 +
 1 file changed, 1 insertion(+)

(limited to 'scripts/inboxqueuehandler.php')

diff --git a/scripts/inboxqueuehandler.php b/scripts/inboxqueuehandler.php
index c76b80389..73d31e854 100755
--- a/scripts/inboxqueuehandler.php
+++ b/scripts/inboxqueuehandler.php
@@ -49,6 +49,7 @@ class InboxQueueHandler extends QueueHandler
     {
         $this->log(LOG_INFO, "Distributing notice to inboxes for $notice->id");
         $notice->addToInboxes();
+        $notice->blowSubsCache();
         return true;
     }
 
-- 
cgit v1.2.3-54-g00ecf