Yuki Takei 8 лет назад
Родитель
Сommit
833b44571e
5 измененных файлов с 23 добавлено и 7 удалено
  1. 1 1
      config/env.dev.js
  2. 3 6
      lib/crowi/dev.js
  3. 14 0
      lib/crowi/index.js
  4. 1 0
      package.json
  5. 4 0
      yarn.lock

+ 1 - 1
config/env.dev.js

@@ -13,7 +13,7 @@ module.exports = {
     // 'express:*',
     // 'crowi:*',
     'crowi:crowi',
-    'crowi:crowi:dev',
+    // 'crowi:crowi:dev',
     'crowi:crowi:express-init',
     'crowi:models:external-account',
     // 'crowi:routes:login',

+ 3 - 6
lib/crowi/dev.js

@@ -21,7 +21,7 @@ class CrowiDev {
   }
 
   init() {
-    this.requireForLiveReload();
+    this.requireForAutoReloadServer();
 
     this.initPromiseRejectionWarningHandler();
     this.initSwig();
@@ -37,12 +37,9 @@ class CrowiDev {
   }
 
   /**
-   * require files for live reloading
+   * require files for node-dev auto reloading
    */
-  requireForLiveReload() {
-    // environment file
-    require(path.join(this.crowi.rootDir, 'config', 'env.dev.js'));
-
+  requireForAutoReloadServer() {
     // load all json files for live reloading
     fs.readdirSync(this.crowi.localeDir).map((dirname) => {
       require(path.join(this.crowi.localeDir, dirname, 'translation.json'));

+ 14 - 0
lib/crowi/index.js

@@ -9,6 +9,7 @@ var debug = require('debug')('crowi:crowi')
 
   , mongoose    = require('mongoose')
 
+  , eazyLogger = require('eazy-logger')
   , helpers = require('./helpers')
   , models = require('../models')
   ;
@@ -16,6 +17,13 @@ var debug = require('debug')('crowi:crowi')
 function Crowi (rootdir, env)
 {
   var self = this;
+  // this.logger = easyLogger.Logger({
+  //   prefix: '[{green:GROWI}]'
+  // });
+  this.logger = eazyLogger.Logger({
+    prefix: "[{green:GROWI}] ",
+    useLevelPrefixes: false,
+  });
 
   this.version = pkg.version;
   this.runtimeVersions = undefined;   // initialized by scanRuntimeVersions()
@@ -368,6 +376,12 @@ Crowi.prototype.start = function() {
     .then(function(app) {
       server = http.createServer(app).listen(self.port, function() {
         debug(`[${self.node_env}] Express server listening on port ${self.port}`);
+
+        self.logger.info('{bold:Server URLs:}');
+        self.logger.unprefixed('info','{grey:=======================================}');
+        self.logger.unprefixed('info',`         APP: {magenta:http:://localhost:${self.port}}`);
+        self.logger.unprefixed('info','{grey:=======================================}');
+
         // setup for dev
         if (self.node_env === 'development') {
           self.crowiDev.setup(server, app);

+ 1 - 0
package.json

@@ -72,6 +72,7 @@
     "debug": "^3.1.0",
     "diff": "^3.3.0",
     "diff2html": "^2.3.3",
+    "easy-logger": "^0.0.5",
     "elasticsearch": "^14.0.0",
     "entities": "^1.1.1",
     "env-cmd": "^7.0.0",

+ 4 - 0
yarn.lock

@@ -2225,6 +2225,10 @@ easy-extender@2.3.2:
   dependencies:
     lodash "^3.10.1"
 
+easy-logger@^0.0.5:
+  version "0.0.5"
+  resolved "https://registry.yarnpkg.com/easy-logger/-/easy-logger-0.0.5.tgz#c092fea8e8828c35c2a738cb93c6d0c31ef222c5"
+
 eazy-logger@3.0.2:
   version "3.0.2"
   resolved "https://registry.yarnpkg.com/eazy-logger/-/eazy-logger-3.0.2.tgz#a325aa5e53d13a2225889b2ac4113b2b9636f4fc"