use celery routers from gvacommon

docs/changelog.rst

@@ -1,6 +1,7 @@
 Changelog
 =========
 
+* :support:`-` use celery routers from gvacommon
 * :feature:`-` automatic creation of mailbox names from user names
 * :bug:`-` fix broken mailbox admin
 

gnuviechadmin/gnuviechadmin/settings/base.py

@@ -279,8 +279,8 @@ CELERY_RESULT_BACKEND = 'amqp'
 CELERY_RESULT_PERSISTENT = True
 CELERY_TASK_RESULT_EXPIRES = None
 CELERY_ROUTES = (
-    'osusers.tasks.LdapRouter',
-    'osusers.tasks.FileRouter',
+    'gvacommon.celeryrouters.LdapRouter',
+    'gvacommon.celeryrouters.FileRouter',
 )
 CELERY_ACCEPT_CONTENT = ['pickle', 'yaml', 'json']
 CELERY_TASK_SERIALIZER = 'json'

gnuviechadmin/osusers/tasks.py

@@ -3,26 +3,6 @@ from __future__ import absolute_import
 from celery import shared_task
 
 
-class LdapRouter(object):
-
-    def route_for_task(self, task, args=None, kwargs=None):
-        if 'ldap' in task:
-            return {'exchange': 'ldap',
-                    'exchange_type': 'direct',
-                    'queue': 'ldap'}
-        return None
-
-
-class FileRouter(object):
-
-    def route_for_task(self, task, args=None, kwargs=None):
-        if 'file' in task:
-            return {'exchange': 'file',
-                    'exchange_type': 'direct',
-                    'queue': 'file'}
-        return None
-
-
 @shared_task
 def create_ldap_group(groupname, gid, descr):
     pass