heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'amqp-switch'

Browse Source
This commit is contained in:
Boris Bobrov 2017-06-10 01:25:24 +03:00
commit 4a14f6da51
4 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docs/source/siteadmin/deploying.rst
View File

@ -70,20 +70,25 @@ derivatives) issue the following command::
sudo apt-get install git-core python python-dev python-lxml \ sudo apt-get install git-core python python-dev python-lxml \
python-imaging python-virtualenv npm nodejs-legacy automake \ 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 On a RPM-based system (e.g. Fedora, RedHat, and derivatives) issue the
following command:: following command::
sudo yum install python-paste-deploy python-paste-script \ sudo yum install python-paste-deploy python-paste-script \
git-core python python-devel python-lxml python-imaging \ 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 (Note: MediaGoblin now officially supports Python 3. You may instead
substitute from "python" to "python3" for most package names in the substitute from "python" to "python3" for most package names in the
Debian instructions and this should cover dependency installation. Debian instructions and this should cover dependency installation.
These instructions have not yet been tested on Fedora.) 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 Configure PostgreSQL
~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~

3
mediagoblin/config_spec.ini
View File

@ -153,8 +153,7 @@ CELERY_RESULT_BACKEND = string(default="database")
CELERY_RESULT_DBURI = string(default="sqlite:///%(here)s/celery.db") CELERY_RESULT_DBURI = string(default="sqlite:///%(here)s/celery.db")
# default kombu stuff # default kombu stuff
BROKER_TRANSPORT = string(default="sqlalchemy") BROKER_URL = string(default="amqp://")
BROKER_URL = string(default="sqlite:///%(here)s/kombu.db")
# known booleans # known booleans
CELERY_RESULT_PERSISTENT = boolean() CELERY_RESULT_PERSISTENT = boolean()

3
mediagoblin/processing/task.py
View File

@ -69,6 +69,9 @@ class ProcessMedia(celery.Task):
""" """
Pass this entry off for processing. Pass this entry off for processing.
""" """
name = 'process_media'
def run(self, media_id, feed_url, reprocess_action, reprocess_info=None): def run(self, media_id, feed_url, reprocess_action, reprocess_info=None):
""" """
Pass the media entry off to the appropriate processing function Pass the media entry off to the appropriate processing function

3
setup.py
View File

@ -56,8 +56,7 @@ install_requires = [
'pytest>=2.3.1', 'pytest>=2.3.1',
'pytest-xdist', 'pytest-xdist',
'werkzeug>=0.7', 'werkzeug>=0.7',
'celery>=3.0,<4.0a0', 'celery>=3.0',
'kombu<4.0a0',
'jinja2', 'jinja2',
'Babel>=1.3', 'Babel>=1.3',
'WebTest>=2.0.18', 'WebTest>=2.0.18',