tenants tearDown, closes mongo model change stream

huridocs · Aug 12, 2024 · 3327680 · 3327680
1 parent 65b02a7
commit 3327680
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 6 deletions.
diff --git a/app/api/tenants/tenantContext.ts b/app/api/tenants/tenantContext.ts
@@ -23,6 +23,8 @@ class Tenants {
 
   defaultTenant: Tenant;
 
+  model?: TenantsModel;
+
   constructor(defaultTenant: Tenant) {
     this.defaultTenant = defaultTenant;
     this.tenants = {
@@ -32,12 +34,17 @@ class Tenants {
 
   async setupTenants() {
     const model = await tenantsModel();
+    this.model = model;
     model.on('change', () => {
       this.updateTenants(model).catch(handleError);
     });
     await this.updateTenants(model);
   }
 
+  async tearDownTenants() {
+    await this.model?.closeChangeStream();
+  }
+
   async updateTenants(model: TenantsModel) {
     const tenants = await model.get();
 

diff --git a/app/api/tenants/tenantsModel.ts b/app/api/tenants/tenantsModel.ts
@@ -3,7 +3,7 @@ import mongoose, { Model, Document } from 'mongoose';
 import { config } from 'api/config';
 import { DB } from 'api/odm/DB';
 import { handleError } from 'api/utils';
-import { MongoError } from 'mongodb';
+import { ChangeStream, MongoError } from 'mongodb';
 
 import { Tenant } from './tenantContext';
 
@@ -45,6 +45,8 @@ class TenantsModel extends EventEmitter {
 
   collectionName: string;
 
+  changeStream?: ChangeStream;
+
   constructor() {
     super();
     this.collectionName = 'tenants';
@@ -54,12 +56,12 @@ class TenantsModel extends EventEmitter {
   private initializeModel() {
     this.model = this.tenantsDB.model<TenantDocument>(this.collectionName, mongoSchema);
 
-    const changeStream = this.model.watch();
-    changeStream.on('change', () => {
+    this.changeStream = this.model.watch();
+    this.changeStream.on('change', () => {
       this.change().catch(handleError);
     });
 
-    changeStream.on('error', (error: MongoError) => {
+    this.changeStream.on('error', (error: MongoError) => {
       //The $changeStream stage is only supported on replica sets
       if (error.code === 40573) {
         // mongo documentation and ts types says changeStream.close returns a promise
@@ -90,6 +92,10 @@ class TenantsModel extends EventEmitter {
     this.initializeModel();
   }
 
+  async closeChangeStream() {
+    await this.changeStream?.close();
+  }
+
   async change() {
     const tenants = await this.get();
     this.emit('change', tenants);

diff --git a/scripts/scripts.v2/generateAutomaticTranslationConfig.ts b/scripts/scripts.v2/generateAutomaticTranslationConfig.ts
@@ -35,6 +35,6 @@ const semanticConfig = require(config);
   await tenants.run(async () => {
     await AutomaticTranslationFactory.defaultGenerateATConfig().execute(semanticConfig);
   }, tenant);
-  process.exit();
-  // await DB.disconnect();
+  await tenants.tearDownTenants();
+  await DB.disconnect();
 })();