From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Thu, 20 Dec 2012 13:03:16 +0000 (+0100)
Subject: Switch deprecated BROKER_HOST to new BROKER_URL
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=41098dff577268a90d20afae9f387963c5abe9c0;p=mediagoblin.git

Switch deprecated BROKER_HOST to new BROKER_URL

People will need to switch that setting in their mediagoblin.ini too.
Make sure we RELEASE NOTE this.

Signed-off-by: Sebastian Spaeth <Sebastian@SSpaeth.de>
---

diff --git a/mediagoblin/config_spec.ini b/mediagoblin/config_spec.ini
index 81dadd25..8f03509d 100644
--- a/mediagoblin/config_spec.ini
+++ b/mediagoblin/config_spec.ini
@@ -152,7 +152,7 @@ CELERY_RESULT_DBURI = string(default="sqlite:///%(here)s/celery.db")
 
 # default kombu stuff
 BROKER_TRANSPORT = string(default="sqlalchemy")
-BROKER_HOST = string(default="sqlite:///%(here)s/kombu.db")
+BROKER_URL = string(default="sqlite:///%(here)s/kombu.db")
 
 # known booleans
 CELERY_RESULT_PERSISTENT = boolean()
diff --git a/mediagoblin/tests/test_celery_setup.py b/mediagoblin/tests/test_celery_setup.py
index 0184436a..d60293f9 100644
--- a/mediagoblin/tests/test_celery_setup.py
+++ b/mediagoblin/tests/test_celery_setup.py
@@ -55,6 +55,6 @@ def test_setup_celery_from_config():
         pkg_resources.resource_filename('mediagoblin.tests', 'celery.db'))
 
     assert fake_celery_module.BROKER_TRANSPORT == 'sqlalchemy'
-    assert fake_celery_module.BROKER_HOST == (
+    assert fake_celery_module.BROKER_URL == (
         'sqlite:///' +
         pkg_resources.resource_filename('mediagoblin.tests', 'kombu.db'))
diff --git a/mediagoblin/tests/test_mgoblin_app.ini b/mediagoblin/tests/test_mgoblin_app.ini
index 535cf1c1..da0dffb9 100644
--- a/mediagoblin/tests/test_mgoblin_app.ini
+++ b/mediagoblin/tests/test_mgoblin_app.ini
@@ -23,7 +23,7 @@ base_dir = %(here)s/user_dev/media/queue
 [celery]
 CELERY_ALWAYS_EAGER = true
 CELERY_RESULT_DBURI = "sqlite:///%(here)s/user_dev/celery.db"
-BROKER_HOST = "sqlite:///%(here)s/user_dev/kombu.db"
+BROKER_URL = "sqlite:///%(here)s/test_user_dev/kombu.db"
 
 [plugins]
 [[mediagoblin.plugins.api]]