some basic fixes for inbox and memcached queue handlers

2 files changed, 27 insertions, 4 deletions

diff --git a/scripts/inboxqueuehandler.php b/scripts/inboxqueuehandler.php
index 16e334b83..c76b80389 100644..100755
--- 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
index 43231fa2c..6e819b41f 100644..100755
--- 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();