From 3bdf634703d40848ac28ea0e6f3f5ab6035d4657 Mon Sep 17 00:00:00 2001
From: Jan Dittberner <jan@dittberner.info>
Date: Sat, 27 Dec 2014 13:59:38 +0100
Subject: [PATCH] move celery routers to gvacommon

---
 docs/changelog.rst               |  2 ++
 gvafile/gvafile/settings/base.py |  4 ++--
 gvafile/osusers/tasks.py         | 20 --------------------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b77c443..2aff143 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -1,6 +1,8 @@
 Changelog
 =========
 
+* :support:`-` move celery routers into gvacommon that is in it's own
+  repository to be used by others (gva, gvaldap)
 * :bug:`-` sftp directories are now owned by root instead of user
 
 * :release:`0.1.0 <2014-12-26>`
diff --git a/gvafile/gvafile/settings/base.py b/gvafile/gvafile/settings/base.py
index c204589..fc83245 100644
--- a/gvafile/gvafile/settings/base.py
+++ b/gvafile/gvafile/settings/base.py
@@ -283,8 +283,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'
diff --git a/gvafile/osusers/tasks.py b/gvafile/osusers/tasks.py
index c7bc5b1..cab899d 100644
--- a/gvafile/osusers/tasks.py
+++ b/gvafile/osusers/tasks.py
@@ -25,26 +25,6 @@ SETFACL_CMD = '/usr/bin/setfacl'
 RM_CMD = '/bin/rm'
 
 
-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
-
-
 def _build_sftp_directory_name(username):
     """
     Constructs the SFTP directory name for a given username.