fix: Various cleanup errors

Fixes #525
cube-js · Mar 21, 2020 · 538f6d0 · 538f6d0
1 parent ec0b851
commit 538f6d0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/packages/cubejs-query-orchestrator/orchestrator/QueryOrchestrator.js b/packages/cubejs-query-orchestrator/orchestrator/QueryOrchestrator.js
@@ -90,7 +90,9 @@ class QueryOrchestrator {
   }
 
   async cleanup() {
-    await this.redisPool.cleanup();
+    if (this.redisPool) {
+      await this.redisPool.cleanup();
+    }
   }
 }
 

diff --git a/packages/cubejs-server-core/core/OrchestratorApi.js b/packages/cubejs-server-core/core/OrchestratorApi.js
@@ -89,7 +89,8 @@ class OrchestratorApi {
   release() {
     return Promise.all([
       this.releaseDriver(this.driverFactory),
-      this.releaseDriver(this.externalDriverFactory)
+      this.releaseDriver(this.externalDriverFactory),
+      this.orchestrator.cleanup()
     ]);
   }
 

diff --git a/packages/cubejs-server-core/core/index.js b/packages/cubejs-server-core/core/index.js
@@ -422,7 +422,7 @@ class CubejsServerCore {
           }
           return driverPromise;
         },
-        getExternalDriverFactory: async () => {
+        getExternalDriverFactory: this.externalDriverFactory && (async () => {
           if (!externalPreAggregationsDriverPromise) {
             const driver = await this.externalDriverFactory(context);
             externalPreAggregationsDriverPromise = driver.testConnection().then(() => driver).catch(e => {
@@ -431,7 +431,7 @@ class CubejsServerCore {
             });
           }
           return externalPreAggregationsDriverPromise;
-        },
+        }),
         redisPrefix: dataSourceId,
         orchestratorOptions: this.orchestratorOptions(context)
       });