From eb53fce3ac162abfaab37c9a0df38890688cf590 Mon Sep 17 00:00:00 2001 From: Matt Robenolt Date: Mon, 2 May 2016 11:27:45 -0700 Subject: [PATCH] Add support for rabbitmq --- git/Dockerfile | 3 +++ git/sentry.conf.py | 27 +++++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/git/Dockerfile b/git/Dockerfile index e44d8a5..e201fc0 100644 --- a/git/Dockerfile +++ b/git/Dockerfile @@ -34,6 +34,9 @@ RUN set -ex \ ENV NODE_VERSION 0.12.13 ENV NPM_VERSION 2.15.4 +# Support for RabbitMQ +RUN pip install librabbitmq==1.6.1 + ARG SENTRY_BUILD=master ENV SENTRY_BUILD $SENTRY_BUILD diff --git a/git/sentry.conf.py b/git/sentry.conf.py index 2627b63..10ea75a 100644 --- a/git/sentry.conf.py +++ b/git/sentry.conf.py @@ -7,6 +7,10 @@ # SENTRY_DB_NAME # SENTRY_DB_USER # SENTRY_DB_PASSWORD +# SENTRY_RABBITMQ_HOST +# SENTRY_RABBITMQ_USERNAME +# SENTRY_RABBITMQ_PASSWORD +# SENTRY_RABBITMQ_VHOST # SENTRY_REDIS_HOST # SENTRY_REDIS_PORT # SENTRY_REDIS_DB @@ -139,8 +143,27 @@ # information on configuring your queue broker and workers. Sentry relies # on a Python framework called Celery to manage queues. -CELERY_ALWAYS_EAGER = False -BROKER_URL = 'redis://' + redis + ':' + redis_port + '/' + redis_db +rabbitmq = env('SENTRY_RABBITMQ_HOST') or (env('RABBITMQ_PORT_5672_TCP_ADDR') and 'rabbitmq') + +if rabbitmq: + BROKER_URL = ( + 'amqp://' + ( + env('SENTRY_RABBITMQ_USERNAME') + or env('RABBITMQ_ENV_RABBITMQ_DEFAULT_USER') + or 'guest' + ) + ':' + ( + env('SENTRY_RABBITMQ_PASSWORD') + or env('RABBITMQ_ENV_RABBITMQ_DEFAULT_PASS') + or 'guest' + ) + '@' + rabbitmq + '/' + ( + env('SENTRY_RABBITMQ_VHOST') + or env('RABBITMQ_ENV_RABBITMQ_DEFAULT_VHOST') + or '/' + ) + ) +else: + BROKER_URL = 'redis://' + redis + ':' + redis_port + '/' + redis_db + ############### # Rate Limits #