Move rabbitmq username into settings.py

(imported from commit f9a8f80f53b8774781b8558444e601567cb59835)

zerver/lib/queue.py

@@ -39,7 +39,7 @@ class SimpleQueueClient(object):
     def _get_parameters(self):
         return pika.ConnectionParameters('localhost',
             credentials = pika.PlainCredentials(
-                'humbug', settings.RABBITMQ_PASSWORD))
+                settings.RABBITMQ_USERNAME, settings.RABBITMQ_PASSWORD))
 
     def _generate_ctag(self, queue_name):
         return "%s_%s" % (queue_name, str(random.getrandbits(16)))

zproject/settings.py

@@ -446,6 +446,7 @@ PIPELINE_YUI_BINARY     = '/usr/bin/env yui-compressor'
 
 
 USING_RABBITMQ = DEPLOYED
+RABBITMQ_USERNAME = 'humbug'
 
 SESSION_ENGINE = "django.contrib.sessions.backends.cached_db"