diff options
| author | Ask Solem <ask@celeryproject.org> | 2011-10-25 22:22:02 +0100 |
|---|---|---|
| committer | Ask Solem <ask@celeryproject.org> | 2011-10-25 22:22:02 +0100 |
| commit | b25657c9d215d46eaee4bad38bc7beb831c62b98 (patch) | |
| tree | 15a7b3c9a55874adbd90d9523cbfd68f34d0113e /examples/simple_task_queue | |
| parent | 12ad48f4862c6165b1eeda4e7791dbd4e467303f (diff) | |
| parent | 419d08bee63c7237f828a5e0169abf76c84421e4 (diff) | |
| download | kombu-b25657c9d215d46eaee4bad38bc7beb831c62b98.tar.gz | |
Merge branch 'master' into 2.0-devel
Conflicts:
AUTHORS
examples/simple_task_queue/worker.py
kombu/connection.py
kombu/serialization.py
kombu/transport/SQS.py
kombu/utils/eventio.py
Diffstat (limited to 'examples/simple_task_queue')
| -rw-r--r-- | examples/simple_task_queue/client.py | 2 | ||||
| -rw-r--r-- | examples/simple_task_queue/worker.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/examples/simple_task_queue/client.py b/examples/simple_task_queue/client.py index eae36144..1ab6175a 100644 --- a/examples/simple_task_queue/client.py +++ b/examples/simple_task_queue/client.py @@ -25,5 +25,5 @@ if __name__ == "__main__": from tasks import hello_task connection = BrokerConnection("amqp://guest:guest@localhost:5672//") - send_as_task(connection, fun=hello_task, args=("Kombu", ), + send_as_task(connection, fun=hello_task, args=("Kombu", ), kwargs={}, priority="high") diff --git a/examples/simple_task_queue/worker.py b/examples/simple_task_queue/worker.py index 8b521a43..063a6b4d 100644 --- a/examples/simple_task_queue/worker.py +++ b/examples/simple_task_queue/worker.py @@ -28,7 +28,7 @@ class Worker(ConsumerMixin): if __name__ == "__main__": from kombu import BrokerConnection - from kombu.log import setup_logging + from kombu.utils.debug import setup_logging setup_logging(loglevel="INFO") with BrokerConnection("amqp://guest:guest@localhost:5672//") as conn: |