more progress, upgrading kombu but not working yet in async

helios_auth/auth_systems/openid/util.py

@@ -41,9 +41,14 @@ def getOpenIDStore(filestore_path, table_prefix):
     The result of this function should be passed to the Consumer
     constructor as the store parameter.
     """
-    if not settings.DATABASES['default'].ENGINE:
+
+    db_engine = settings.DATABASES['default']['ENGINE']
+    if not db_engine:
         return FileOpenIDStore(filestore_path)
 
+    # get the suffix
+    db_engine = db_engine.split('.')[-1]
+
     # Possible side-effect: create a database connection if one isn't
     # already open.
     connection.cursor()
@@ -62,12 +67,12 @@ def getOpenIDStore(filestore_path, table_prefix):
         }
 
     try:
-        s = types[settings.DATABASE_ENGINE](connection.connection,
+        s = types[db_engine](connection.connection,
                                             **tablenames)
     except KeyError:
         raise ImproperlyConfigured, \
               "Database engine %s not supported by OpenID library" % \
-              (settings.DATABASE_ENGINE,)
+              (db_engine,)
 
     try:
         s.createTables()

requirements.txt

@@ -5,9 +5,8 @@ anyjson==0.3.1
 celery==2.3.3
 distribute==0.6.24
 django-celery==2.3.3
-django-kombu==0.9.4
 django-picklefield==0.1.9
-kombu==1.4.1
+kombu==2.5.7
 psycopg2==2.4.1
 pyparsing==1.5.6
 python-dateutil==1.5

settings.py

@@ -85,7 +85,7 @@ INSTALLED_APPS = (
     'django.contrib.sites',
     ## needed for queues
     'djcelery',
-    'djkombu',
+    'kombu',
     ## needed for schema migration
     'south',
     ## HELIOS stuff
@@ -188,8 +188,8 @@ logging.basicConfig(
 # set up django-celery
 import djcelery
 djcelery.setup_loader()
-BROKER_BACKEND = "djkombu.transport.DatabaseTransport"
+BROKER_BACKEND = "kombu.transport.django"
 CELERY_RESULT_DBURI = DATABASES['default']
 
 # for testing
-CELERY_ALWAYS_EAGER = True
+#CELERY_ALWAYS_EAGER = True