In RabbitMQ administration the 'default' celery queue is hardcoded

[Luuk]

In the RabbitMQ administration the 'default' celery queue is defined as (line 3237 in views.py):

                if queue['name'] == u'default':

While actually the name of the queue is defined in "settings.py":

CELERY_DEFAULT_QUEUE = 'default'

I would suggest to change line 3237 as:

                if queue['name'] == settings.CELERY_DEFAULT_QUEUE:

Of course you need to import the 'openremproject.settings' first.

[Ed McDonagh]

You are right - I did think that briefly when I was coming that!

[Luuk]

Also in template rabbitmq_queues.html the queues are compared to the string 'default'. But I think this part can be omitted as the 'default' queue shouldn't appear in the "other_queues" any more.

[Ed McDonagh]

Good spot. Thanks Luuk

[Luuk]

Resolves issue #716 - default queue is hard coded

removed comparison of the name of other_queues to 'default' string in rabbitmq_queues.html

changed 'default' to settings.CELERY_DEFAULT_QUEUE in views.py

→ <<cset 0a0a21e83bcc>>

[Luuk]

I don't know why it was set to resolved. I didn't do that manually.

[Ed McDonagh]

You used the magic of commit message syntax: https://confluence.atlassian.com/bitbucket/resolve-issues-automatically-when-users-push-code-221451126.html

Thanks for setting it back to open, so we can close on merge.

[Ed McDonagh]

Tested, and added ref #716 to changes.

→ <<cset cf3f5df64740>>

[Ed McDonagh]

Merged in Issue716defaultQueueHardCoded (pull request #271)

Fixed issue #716 - default queue is hard coded

Approved-by: Ed McDonagh

→ <<cset 824ed5e6294c>>