Merge commit 'refs/merge-requests/10' of git://gitorious.org/statusnet/gnu-social...

diff --git a/CONFIGURE b/CONFIGURE
index c4a43a3dc8cdc904ead250776147e308fcf94445..8abc0513a980b8dc1abb4f70bce4f4783586aa24 100644 (file)
--- a/CONFIGURE
+++ b/CONFIGURE
@@ -182,6 +182,8 @@ sending out SMS email or XMPP messages, for off-line processing. See
 'Queues and daemons' above for how to set this up.
 
 enabled: Whether to uses queues. Defaults to false.
+daemon: Wather to use queuedaemon. Defaults to false, which means
+    you'll use OpportunisticQM plugin.
 subsystem: Which kind of queueserver to use. Values include "db" for
     our hacked-together database queuing (no other server
     required) and "stomp" for a stomp server.

diff --git a/INSTALL b/INSTALL
index bac8d3400504fca8b93466575e0e196b1ee25bb9..f9fce18a7b78af9d7cb8d732421039ed6615a253 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -368,12 +368,39 @@ Queues and daemons
 ------------------
 
 Some activities that StatusNet needs to do, like broadcast OStatus, SMS,
-and XMPP messages, can be 'queued' and done by off-line bots instead.
-For this to work, you must be able to run long-running offline
-processes, either on your main Web server or on another server you
-control. (Your other server will still need all the above
-prerequisites, with the exception of Apache.) Installing on a separate
-server is probably a good idea for high-volume sites.
+XMPP messages and TwitterBridge operations, can be 'queued' and done by
+off-line bots instead.
+
+Two mechanisms are available to achieve offline operations:
+
+* New embedded OpportunisticQM plugin, which is enabled by default
+* Legacy queuedaemon script, which can be enabled via config file.
+
+### OpportunisticQM plugin
+
+This plugin is enabled by default. It tries its best to do background
+job during regular HTTP requests, like API or HTML pages calls.
+
+Since queueing system is enabled by default, notices to be broadcasted
+will be stored, by default, into DB (table queue_items).
+
+Each time it can, OpportunisticQM will try to handle some of them.
+
+This is a good solution wether you:
+
+* have no access to command line (shared hosting)
+* do not want to deal with long-running PHP process
+* run a low traffic GnuSocial instance
+
+In other case, you really should consider using queuedaemon.
+
+### queuedaemon
+
+If you want to use legacy queuedaemon, you must be able to run
+long-running offline processes, either on your main Web server or on
+another server you control. (Your other server will still need all the
+above prerequisites, with the exception of Apache.) Installing on a
+separate server is probably a good idea for high-volume sites.
 
 1. You'll need the "CLI" (command-line interface) version of PHP
    installed on whatever server you use.
@@ -399,6 +426,7 @@ server is probably a good idea for high-volume sites.
    server!), set the following variable:
 
        $config['queue']['enabled'] = true;
+       $config['queue']['daemon'] = true;
 
    You may also want to look at the 'daemon' section of this file for
    more daemon options. Note that if you set the 'user' and/or 'group'
@@ -412,7 +440,7 @@ This will run the queue handlers:
 * queuedaemon.php - polls for queued items for inbox processing and
   pushing out to OStatus, SMS, XMPP, etc.
 * imdaemon.php - if an IM plugin is enabled (like XMPP)
-* other daemons that you may have enabled
+* other daemons, like TwitterBridge ones, that you may have enabled
 
 These daemons will automatically restart in most cases of failure
 including memory leaks (if a memory_limit is set), but may still die

diff --git a/lib/default.php b/lib/default.php
index cedce64563c988b122c6045e2b372ffa9e9f722d..c5794565a302f181c740d8b00c02ec1785021054 100644 (file)
--- a/lib/default.php
+++ b/lib/default.php
@@ -85,6 +85,7 @@ $default =
               'facility' => LOG_USER),
         'queue' =>
         array('enabled' => true,
+              'daemon' => false, # Use queuedaemon. Default to false
               'subsystem' => 'db', # default to database, or 'stomp'
               'stomp_server' => null,
               'queue_basename' => '/queue/statusnet/',

diff --git a/scripts/getvaliddaemons.php b/scripts/getvaliddaemons.php
index b4e1e57e43be85a25af4e8bfd3b021d1dea21d5c..909060722486deddbfef5639434b91c6cbfbfbfa 100755 (executable)
--- a/scripts/getvaliddaemons.php
+++ b/scripts/getvaliddaemons.php
@@ -37,7 +37,9 @@ require_once INSTALLDIR.'/scripts/commandline.inc';
 
 $daemons = array();
 
-#$daemons[] = INSTALLDIR.'/scripts/queuedaemon.php';
+if (common_config('queue', 'daemon')) {
+    $daemons[] = INSTALLDIR.'/scripts/queuedaemon.php';
+}
 
 if (Event::handle('GetValidDaemons', array(&$daemons))) {
     foreach ($daemons as $daemon) {