add SUP link to User RSS

[quix0rs-gnu-social.git] / scripts / publicqueuehandler.php

diff --git a/scripts/publicqueuehandler.php b/scripts/publicqueuehandler.php
index 0d95a489f84d07d3ea2b6fac2a41a3d9cb5490de..b1ae1d581dbcdda2ec57039183a264d4bbd3d5ac 100755 (executable)
--- a/scripts/publicqueuehandler.php
+++ b/scripts/publicqueuehandler.php
@@ -29,38 +29,33 @@ define('LACONICA', true);
 
 require_once(INSTALLDIR . '/lib/common.php');
 require_once(INSTALLDIR . '/lib/jabber.php');
-require_once(INSTALLDIR . '/lib/queuehandler.php');
+require_once(INSTALLDIR . '/lib/xmppqueuehandler.php');
 
 set_error_handler('common_error_handler');
 
-class PublicQueueHandler extends QueueHandler {
+class PublicQueueHandler extends XmppQueueHandler {
        
        function transport() {
                return 'public';
        }
        
-       function start() {
-               # Low priority; we don't want to receive messages
-               $this->conn = jabber_connect($this->_id, NULL, -1);
-               return !is_null($this->conn);
-       }
-
        function handle_notice($notice) {
-               return jabber_public_notice($notice);
-       }
-       
-       function finish() {
+               try {
+                       return jabber_public_notice($notice);
+               } catch (XMPPHP_Exception $e) {
+                       $this->log(LOG_ERR, "Got an XMPPHP_Exception: " . $e->getMessage());
+                       die($e->getMessage());
+               }
        }
 }
 
+ini_set("max_execution_time", "0");
+ini_set("max_input_time", "0");
+set_time_limit(0);
 mb_internal_encoding('UTF-8');
 
 $resource = ($argc > 1) ? $argv[1] : (common_config('xmpp','resource') . '-public');
 
-$handler = new XmppQueueHandler($resource);
-
-if ($handler->start()) {
-       $handler->handle_queue();
-}
+$handler = new PublicQueueHandler($resource);
 
-$handler->finish();
+$handler->runOnce();