fix: socket case

midwayjs · Dec 21, 2024 · 9f30dd1 · 9f30dd1
1 parent 821ea82
commit 9f30dd1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 7 deletions.
diff --git a/packages/core/src/baseFramework.ts b/packages/core/src/baseFramework.ts
@@ -147,11 +147,11 @@ export abstract class BaseFramework<
       ctxLoggerCache.set(name, ctxLogger);
       return ctxLogger;
     } else {
-      const appLogger = this.getLogger(name);
       // avoid maximum call stack size exceeded
       if (ctx['_logger']) {
         return ctx['_logger'];
       }
+      const appLogger = this.getLogger(name);
       ctx['_logger'] = this.loggerService.createContextLogger(ctx, appLogger);
       return ctx['_logger'];
     }

diff --git a/packages/core/src/setup.ts b/packages/core/src/setup.ts
@@ -31,8 +31,9 @@ import {
 const debug = util.debuglog('midway:debug');
 
 let stepIdx = 1;
+let projectIdx = 1;
 function printStepDebugInfo(stepInfo: string) {
-  debug(`\n\nStep ${stepIdx++}: ${stepInfo}\n`);
+  debug(`\n\nProject ${projectIdx} - Step ${stepIdx++}: ${stepInfo}\n`);
 }
 
 /**
@@ -139,24 +140,34 @@ export async function initializeGlobalApplicationContext(
 export async function destroyGlobalApplicationContext(
   applicationContext: IMidwayGlobalContainer
 ) {
+
+  printStepDebugInfo('Ready to destroy applicationContext');
   const loggerService = await applicationContext.getAsync(MidwayLoggerService);
   const loggerFactory = loggerService.getCurrentLoggerFactory();
 
+  printStepDebugInfo('Stopping lifecycle');
   // stop lifecycle
   const lifecycleService = await applicationContext.getAsync(
     MidwayLifeCycleService
   );
   await lifecycleService.stop();
+
+  printStepDebugInfo('Stopping applicationContext');
   // stop container
   await applicationContext.stop();
+
+  printStepDebugInfo('Closing loggerFactory');
   loggerFactory.close();
+
+  printStepDebugInfo('Cleaning performance manager');
   MidwayPerformanceManager.cleanAll();
 
   global['MIDWAY_APPLICATION_CONTEXT'] = undefined;
   global['MIDWAY_MAIN_FRAMEWORK'] = undefined;
 
   // reset counter
   stepIdx = 1;
+  projectIdx++;
 }
 
 /**

diff --git a/packages/socketio/test/index.test.ts b/packages/socketio/test/index.test.ts
@@ -147,15 +147,14 @@ describe('/test/index.test.ts', () => {
       port: 3000,
     });
 
-    await new Promise<void>(async (resolve, reject) => {
+    const promise = new Promise<void>((resolve) => {
       client.on('connect_error', err => {
         console.log(err);
         resolve();
       });
-      client.send('my', 1, 2, 3);
-      await closeApp(app);
-    });
-
+    })
+    client.send('my', 1, 2, 3);
+    await Promise.all([closeApp(app), promise]);
     await client.close();
   });