fix: fix framework name and support load server options from pkg

midwayjs · Aug 14, 2018 · b8b4c7d · b8b4c7d
1 parent 1857c08
commit b8b4c7d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/packages/midway/cluster/utils.js b/packages/midway/cluster/utils.js
@@ -30,6 +30,7 @@ exports.isTypeScriptEnvironment = () => {
  * @returns {*}
  */
 exports.formatOptions = (options) => {
+  options.framework = 'midway';
   if(!options.baseDir) {
     options.baseDir = process.cwd();
   }

diff --git a/packages/midway/server.js b/packages/midway/server.js
@@ -12,7 +12,19 @@
  * @param callback {Function} 启动完成的回调
  */
 const Master = require('./cluster/master');
-
-module.exports = (options, callback) => {
-  new Master(options).ready(callback);
-};
+const path = require('path');
+let options = {};
+try {
+  const pkg = require(path.join(process.cwd(), 'package.json'));
+  const serverOpts = pkg['midway-server-options'];
+  if(serverOpts) {
+    if(typeof serverOpts === 'string') {
+      options = require(path.join(process.cwd(), serverOpts));
+    } else {
+      options = serverOpts;
+    }
+  }
+} catch (err) {
+  console.error('[midway]: load server config error ', err);
+}
+new Master(options);