Move merge tasks to new queue

getsentry · Jan 26, 2016 · aea7aa7 · aea7aa7
1 parent 1cbbbf5
commit aea7aa7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/sentry/conf/server.py b/src/sentry/conf/server.py
@@ -397,6 +397,7 @@
     Queue('alerts', routing_key='alerts'),
     Queue('auth', routing_key='auth'),
     Queue('cleanup', routing_key='cleanup'),
+    Queue('merge', routing_key='merge'),
     Queue('search', routing_key='search'),
     Queue('events', routing_key='events'),
     Queue('update', routing_key='update'),

diff --git a/src/sentry/tasks/merge.py b/src/sentry/tasks/merge.py
@@ -18,7 +18,7 @@
 logger = get_task_logger(__name__)
 
 
-@instrumented_task(name='sentry.tasks.merge.merge_group', queue='cleanup',
+@instrumented_task(name='sentry.tasks.merge.merge_group', queue='merge',
                    default_retry_delay=60 * 5, max_retries=None)
 @retry
 def merge_group(from_object_id=None, to_object_id=None, **kwargs):
@@ -75,7 +75,7 @@ def merge_group(from_object_id=None, to_object_id=None, **kwargs):
         pass
 
 
-@instrumented_task(name='sentry.tasks.merge.rehash_group_events', queue='cleanup',
+@instrumented_task(name='sentry.tasks.merge.rehash_group_events', queue='merge',
                    default_retry_delay=60 * 5, max_retries=None)
 @retry
 def rehash_group_events(group_id, **kwargs):