vona-core 5.1.44 → 5.1.45

package/dist/index.js

@@ -4258,7 +4258,9 @@ function prepareAppInfo(env) {
 }
 
 let __closing$1 = false;
+let __failed = false;
 let __timeout;
+const __reloading = new WeakSet();
 async function _closeInner$1() {
   __timeout = setTimeout(() => {
     // eslint-disable-next-line no-console
@@ -4274,32 +4276,37 @@ function handleProcessMaster(workers) {
       await _closeInner$1();
     });
   });
-  for (let i = 0; i < workers; i++) {
-    cluster.fork();
-  }
   cluster.on('message', (worker, message) => {
     if (message === 'reload-worker') {
       if (!__closing$1) {
         cluster.fork();
       }
+      __reloading.add(worker);
       worker.process.kill('SIGTERM');
     }
   });
   cluster.on('exit', (_worker, _code, _signal) => {
-    // console.log(`----------------- worker ${_worker.process.pid} died`, _code, _signal);
+    const expectedSignal = __closing$1 && ['SIGINT', 'SIGUSR2', 'SIGTERM'].includes(_signal) || __reloading.has(_worker) && _signal === 'SIGTERM';
+    __reloading.delete(_worker);
+    if ((_code !== 0 || _signal) && !expectedSignal) {
+      __failed = true;
+    }
     if (cluster.workers && Object.keys(cluster.workers).length === 0) {
       clearTimeout(__timeout);
       // log
       const app = useApp();
       if (app.meta.env.LOGGER_DUMMY !== 'true') {
-        const message = `Master shutdown gracefully: ${process.pid}`;
+        const message = `Master shutdown ${__failed ? 'with worker failure' : 'gracefully'}: ${process.pid}`;
         // eslint-disable-next-line
         console.log(chalk.cyan(message));
       }
       // exit
-      process.exit(0);
+      process.exit(__failed ? 1 : 0);
     }
   });
+  for (let i = 0; i < workers; i++) {
+    cluster.fork();
+  }
 }
 
 let __closing = false;
@@ -4350,8 +4357,8 @@ function handleProcessWork() {
 
 async function startCluster(workers, bootstrapOptions) {
   if (cluster.isPrimary) {
+    await createAppMaster(bootstrapOptions);
     handleProcessMaster(workers);
-    createAppMaster(bootstrapOptions);
   } else {
     await startWorker(bootstrapOptions);
   }