From f57a2c440df616b0bc5be69a5f9f29a06b3228b3 Mon Sep 17 00:00:00 2001
From: Andrew Donnellan <andrew@donnellan.id.au>
Date: Mon, 13 Apr 2015 12:32:16 +1000
Subject: [PATCH] Update celeryconfig.py.example to use BROKER_URL and remove
 deprecated config variables. Update test documentation to substitute
 references to the deprecated 'celeryd' with 'celery worker'.

---
 celeryconfig.py.example | 8 ++------
 tests.py                | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/celeryconfig.py.example b/celeryconfig.py.example
index 7db1a23..9e10cba 100644
--- a/celeryconfig.py.example
+++ b/celeryconfig.py.example
@@ -2,12 +2,8 @@
 #
 # Rename this file to celeryconfig.py
 # Command for test:
-# celeryd --loglevel=INFO
-BROKER_HOST = 'localhost'
-BROKER_PORT = 5672
-BROKER_USER = 'myuser'
-BROKER_PASSWORD = 'mypassword'
-BROKER_VHOST = 'myvhost'
+# celery worker --loglevel=INFO
+BROKER_URL = 'amqp://myuser:mypassword@localhost:5672//'
 CELERY_IMPORTS = ("test_tasks", )
 CELERY_RESULT_BACKEND = "amqp"
 CELERY_AMQP_TASK_RESULT_EXPIRES = 1000
diff --git a/tests.py b/tests.py
index a1af52c..e06e843 100644
--- a/tests.py
+++ b/tests.py
@@ -6,7 +6,7 @@
 1. Install celery, then copy ``celeryconfig.py.example`` to ``celeryconfig.py``
 and tune the configuration file. Follow celery "getting started" guide:
 http://docs.celeryproject.org/en/latest/getting-started/index.html
-2. Launch celeryd as ``celeryd --loglevel=INFO``.
+2. Launch the celery worker with ``celery worker --loglevel=INFO``.
 Make sure that tasks "test_tasks.mkdir" and "test_tasks.MkdirTask" are found.
 3. Run tests with ``nosetests`` command.