Просмотр исходного кода

BugFix: affects of refactoring of CrowiDev

Yuki Takei 7 лет назад
Родитель
Сommit
a296fbd28c
2 измененных файлов с 5 добавлено и 2 удалено
  1. 0 2
      src/server/crowi/dev.js
  2. 5 0
      src/server/crowi/index.js

+ 0 - 2
src/server/crowi/dev.js

@@ -85,8 +85,6 @@ class CrowiDev {
     eazyLogger.unprefixed('info', `         APP: {magenta:${serverUrl}}`);
     eazyLogger.unprefixed('info', `         APP: {magenta:${serverUrl}}`);
     eazyLogger.unprefixed('info', '{grey:=======================================}');
     eazyLogger.unprefixed('info', '{grey:=======================================}');
 
 
-    this.setupExpressAfterListening(app);
-
     return server;
     return server;
   }
   }
 
 

+ 5 - 0
src/server/crowi/index.js

@@ -360,10 +360,15 @@ Crowi.prototype.start = async function() {
 
 
   const server = (this.node_env === 'development') ? this.crowiDev.setupServer(express) : express;
   const server = (this.node_env === 'development') ? this.crowiDev.setupServer(express) : express;
 
 
+  // listen
   const serverListening = server.listen(this.port, () => {
   const serverListening = server.listen(this.port, () => {
     logger.info(`[${this.node_env}] Express server is listening on port ${this.port}`);
     logger.info(`[${this.node_env}] Express server is listening on port ${this.port}`);
+    if (this.node_env === 'development') {
+      this.crowiDev.setupExpressAfterListening(express);
+    }
   });
   });
 
 
+  // setup WebSocket
   const io = require('socket.io')(serverListening);
   const io = require('socket.io')(serverListening);
   io.sockets.on('connection', function(socket) {
   io.sockets.on('connection', function(socket) {
   });
   });