📦 NEW: Use egg-cluster v2 (#5055)

support worker_threads

package.json

@@ -23,7 +23,7 @@
     "cluster-client": "^3.1.1",
     "debug": "^4.3.4",
     "delegates": "^1.0.0",
-    "egg-cluster": "^1.27.1",
+    "egg-cluster": "^2.0.0",
     "egg-cookies": "^2.6.1",
     "egg-core": "^4.26.1",
     "egg-development": "^2.7.0",

test/bench/server.js

@@ -1,5 +1,3 @@
-'use strict';
-
 const http = require('http');
 const path = require('path');
 const mock = require('egg-mock');

test/fixtures/apps/master-worker-started-worker_threads/config/config.default.js

@@ -0,0 +1 @@
+exports.keys = 'test key';

test/fixtures/apps/master-worker-started-worker_threads/dispatch.js

@@ -0,0 +1,8 @@
+const egg = require('../../../..');
+const baseDir = __dirname;
+
+egg.startCluster({
+  startMode: 'worker_threads',
+  workers: 1,
+  baseDir,
+});

test/fixtures/apps/master-worker-started-worker_threads/package.json

@@ -0,0 +1,3 @@
+{
+  "name": "master-worker-started-worker_threads"
+}

test/lib/cluster/master.test.js

@@ -296,5 +296,18 @@ describe('test/lib/cluster/master.test.js', () => {
         done();
       }, 10000);
     });
+
+    it('should start without customEgg and worker_threads', done => {
+      app = coffee.fork(utils.getFilepath('apps/master-worker-started-worker_threads/dispatch.js'))
+        .debug()
+        .coverage(false);
+
+      setTimeout(() => {
+        app.emit('close', 0);
+        app.expect('stdout', /agent_worker#1:\d+ started /);
+        app.expect('stdout', /"startMode":"worker_threads"/);
+        done();
+      }, 10000);
+    });
   });
 });

test/lib/egg.test.js

@@ -180,11 +180,11 @@ describe('test/lib/egg.test.js', () => {
 
     it('should dump slow-boot-action warnning log', async () => {
       const baseDir = utils.getFilepath('apps/dumptiming-slowBootActionMinDuration');
-      await rimraf(path.join(baseDir, 'run'));
-      await rimraf(path.join(baseDir, 'logs'));
+      await utils.rimraf(path.join(baseDir, 'run'));
+      await utils.rimraf(path.join(baseDir, 'logs'));
       const app = utils.app(baseDir);
       await app.ready();
-      await sleep(100);
+      await utils.sleep(100);
       assertFile(path.join(baseDir, 'logs/dumptiming-slowBootActionMinDuration/egg-web.log'), /\[egg:core]\[slow-boot-action] #\d+ \d+ms, name: Did Load in app\.js:didLoad/);
     });
   });