Switch to rabbitmq by default and in docs

diff --git a/docs/source/siteadmin/deploying.rst b/docs/source/siteadmin/deploying.rst
index 80b60642a9397725330b9b7f35aaa2ce1343f848..c7cc2403a4ac6646a404c53587aa7a4b73710264 100644 (file)
--- a/docs/source/siteadmin/deploying.rst
+++ b/docs/source/siteadmin/deploying.rst
@@ -70,20 +70,25 @@ derivatives) issue the following command::
 
     sudo apt-get install git-core python python-dev python-lxml \
         python-imaging python-virtualenv npm nodejs-legacy automake \
-        nginx
+        nginx rabbitmq-server
 
 On a RPM-based system (e.g. Fedora, RedHat, and derivatives) issue the
 following command::
 
     sudo yum install python-paste-deploy python-paste-script \
         git-core python python-devel python-lxml python-imaging \
-        python-virtualenv npm automake nginx
+        python-virtualenv npm automake nginx rabbitmq-server
 
 (Note: MediaGoblin now officially supports Python 3.  You may instead
 substitute from "python" to "python3" for most package names in the
 Debian instructions and this should cover dependency installation.
 These instructions have not yet been tested on Fedora.)
 
+(Note: you might have to include additional repositories to a RPM-
+based system, because rabbitmq-server might be not included in
+official repositories. As an alternative, you can try installing
+redis-server and configure it as celery broker)
+
 Configure PostgreSQL
 ~~~~~~~~~~~~~~~~~~~~
 

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 0a8da73e345541129e9c9c2f4ea6d7d47a65a75e..bd3003d0e599b701f9d4be3a258df898e5010d07 100644 (file)
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -153,8 +153,7 @@ CELERY_RESULT_BACKEND = string(default="database")
 CELERY_RESULT_DBURI = string(default="sqlite:///%(here)s/celery.db")
 
 # default kombu stuff
-BROKER_TRANSPORT = string(default="sqlalchemy")
-BROKER_URL = string(default="sqlite:///%(here)s/kombu.db")
+BROKER_URL = string(default="amqp://")
 
 # known booleans
 CELERY_RESULT_PERSISTENT = boolean()

diff --git a/mediagoblin/processing/task.py b/mediagoblin/processing/task.py
index 5e0e772d9fde83168439ee7dae9d2538349d252e..bedfd32d8bdfc549db68c79a038cddf1d8fc436f 100644 (file)
--- a/mediagoblin/processing/task.py
+++ b/mediagoblin/processing/task.py
@@ -69,6 +69,9 @@ class ProcessMedia(celery.Task):
     """
     Pass this entry off for processing.
     """
+
+    name = 'process_media'
+
     def run(self, media_id, feed_url, reprocess_action, reprocess_info=None):
         """
         Pass the media entry off to the appropriate processing function