Fix "paster db init" when celery is configured with a backend other t…

…han database.
ckan · Jul 21, 2015 · 08d63d0 · 08d63d0
1 parent e711c1d
commit 08d63d0
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/ckan/model/__init__.py b/ckan/model/__init__.py
@@ -217,13 +217,18 @@ def init_db(self):
                 try:
                     import ckan.lib.celery_app as celery_app
                     import celery.db.session as celery_session
-                    ## This creates the database tables it is a slight
-                    ## hack to celery.
+                    import celery.backends.database
+                    ## This creates the database tables (if using that backend)
+                    ## It is a slight hack to celery
                     backend = celery_app.celery.backend
-                    celery_result_session = backend.ResultSession()
-                    engine = celery_result_session.bind
-                    celery_session.ResultModelBase.metadata.create_all(engine)
+                    if isinstance(backend,
+                                  celery.backends.database.DatabaseBackend):
+                        celery_result_session = backend.ResultSession()
+                        engine = celery_result_session.bind
+                        celery_session.ResultModelBase.metadata.\
+                            create_all(engine)
                 except ImportError:
+                    # use of celery is optional
                     pass
 
                 self.init_configuration_data()