Browse Source

clean code

Yuki Takei 8 years ago
parent
commit
1a25f13712
1 changed files with 47 additions and 50 deletions
  1. 47 50
      lib/crowi/index.js

+ 47 - 50
lib/crowi/index.js

@@ -4,7 +4,6 @@
 var debug = require('debug')('crowi:crowi')
 var debug = require('debug')('crowi:crowi')
   , pkg = require('../../package.json')
   , pkg = require('../../package.json')
   , path = require('path')
   , path = require('path')
-  , fs = require('fs')
   , sep = path.sep
   , sep = path.sep
 
 
   , mongoose    = require('mongoose')
   , mongoose    = require('mongoose')
@@ -14,14 +13,10 @@ var debug = require('debug')('crowi:crowi')
   , models = require('../models')
   , models = require('../models')
   ;
   ;
 
 
-function Crowi (rootdir, env)
-{
+function Crowi(rootdir, env) {
   var self = this;
   var self = this;
-  // this.logger = easyLogger.Logger({
-  //   prefix: '[{green:GROWI}]'
-  // });
   this.logger = eazyLogger.Logger({
   this.logger = eazyLogger.Logger({
-    prefix: "[{green:GROWI}] ",
+    prefix: '[{green:GROWI}] ',
     useLevelPrefixes: false,
     useLevelPrefixes: false,
   });
   });
 
 
@@ -63,9 +58,7 @@ function Crowi (rootdir, env)
     page: new (require(self.eventsDir + 'page'))(this),
     page: new (require(self.eventsDir + 'page'))(this),
   };
   };
 
 
-  if (this.node_env == 'development') {
-  }
-};
+}
 
 
 function getMongoUrl(env) {
 function getMongoUrl(env) {
   return env.MONGOLAB_URI || // for B.C.
   return env.MONGOLAB_URI || // for B.C.
@@ -79,31 +72,31 @@ Crowi.prototype.init = function() {
   var self = this;
   var self = this;
 
 
   return Promise.resolve()
   return Promise.resolve()
-  .then(function() {
-    // setup database server and load all modesl
-    return self.setupDatabase();
-  }).then(function() {
-    return self.setupModels();
-  }).then(function() {
-    return self.setupSessionConfig();
-  }).then(function() {
-    return self.setupAppConfig();
-  }).then(function() {
-    return self.scanRuntimeVersions();
-  }).then(function() {
-    return self.setupPassport();
-  }).then(function() {
-    return self.setupSearcher();
-  }).then(function() {
-    return self.setupMailer();
-  }).then(function() {
-    return self.setupInterceptorManager();
-  }).then(function() {
-    return self.setupSlack();
-  }).then(function() {
-    return self.setupCsrf();
-  });
-}
+    .then(function() {
+      // setup database server and load all modesl
+      return self.setupDatabase();
+    }).then(function() {
+      return self.setupModels();
+    }).then(function() {
+      return self.setupSessionConfig();
+    }).then(function() {
+      return self.setupAppConfig();
+    }).then(function() {
+      return self.scanRuntimeVersions();
+    }).then(function() {
+      return self.setupPassport();
+    }).then(function() {
+      return self.setupSearcher();
+    }).then(function() {
+      return self.setupMailer();
+    }).then(function() {
+      return self.setupInterceptorManager();
+    }).then(function() {
+      return self.setupSlack();
+    }).then(function() {
+      return self.setupCsrf();
+    });
+};
 
 
 Crowi.prototype.isPageId = function(pageId) {
 Crowi.prototype.isPageId = function(pageId) {
   if (!pageId) {
   if (!pageId) {
@@ -217,7 +210,7 @@ Crowi.prototype.setupAppConfig = function() {
       return resolve();
       return resolve();
     });
     });
   });
   });
-}
+};
 
 
 Crowi.prototype.setupModels = function() {
 Crowi.prototype.setupModels = function() {
   var self = this
   var self = this
@@ -248,9 +241,9 @@ Crowi.prototype.scanRuntimeVersions = function() {
       }
       }
       self.runtimeVersions = result;
       self.runtimeVersions = result;
       resolve();
       resolve();
-    })
+    });
   });
   });
-}
+};
 
 
 Crowi.prototype.getSearcher = function() {
 Crowi.prototype.getSearcher = function() {
   return this.searcher;
   return this.searcher;
@@ -262,7 +255,7 @@ Crowi.prototype.getMailer = function() {
 
 
 Crowi.prototype.getInterceptorManager = function() {
 Crowi.prototype.getInterceptorManager = function() {
   return this.interceptorManager;
   return this.interceptorManager;
-}
+};
 
 
 Crowi.prototype.setupPassport = function() {
 Crowi.prototype.setupPassport = function() {
   const config = this.getConfig();
   const config = this.getConfig();
@@ -286,7 +279,7 @@ Crowi.prototype.setupPassport = function() {
   this.passportService.setupLdapStrategy();
   this.passportService.setupLdapStrategy();
 
 
   return Promise.resolve();
   return Promise.resolve();
-}
+};
 
 
 Crowi.prototype.setupSearcher = function() {
 Crowi.prototype.setupSearcher = function() {
   var self = this;
   var self = this;
@@ -299,7 +292,8 @@ Crowi.prototype.setupSearcher = function() {
     if (searcherUri) {
     if (searcherUri) {
       try {
       try {
         self.searcher = new (require(path.join(self.libDir, 'util', 'search')))(self, searcherUri);
         self.searcher = new (require(path.join(self.libDir, 'util', 'search')))(self, searcherUri);
-      } catch (e) {
+      }
+      catch (e) {
         debug('Error on setup searcher', e);
         debug('Error on setup searcher', e);
         self.searcher = null;
         self.searcher = null;
       }
       }
@@ -333,7 +327,8 @@ Crowi.prototype.setupSlack = function() {
   return new Promise(function(resolve, reject) {
   return new Promise(function(resolve, reject) {
     if (!Config.hasSlackConfig(config)) {
     if (!Config.hasSlackConfig(config)) {
       self.slack = {};
       self.slack = {};
-    } else {
+    }
+    else {
       self.slack = require('../util/slack')(self);
       self.slack = require('../util/slack')(self);
     }
     }
 
 
@@ -343,7 +338,7 @@ Crowi.prototype.setupSlack = function() {
 
 
 Crowi.prototype.setupCsrf = function() {
 Crowi.prototype.setupCsrf = function() {
   var Tokens = require('csrf');
   var Tokens = require('csrf');
-  var tokens = this.tokens = new Tokens();
+  this.tokens = new Tokens();
 
 
   return Promise.resolve();
   return Promise.resolve();
 };
 };
@@ -367,7 +362,7 @@ Crowi.prototype.start = function() {
 
 
   return Promise.resolve()
   return Promise.resolve()
     .then(function() {
     .then(function() {
-      return self.init()
+      return self.init();
     })
     })
     .then(function() {
     .then(function() {
       return self.buildServer();
       return self.buildServer();
@@ -377,9 +372,9 @@ Crowi.prototype.start = function() {
         debug(`[${self.node_env}] Express server listening on port ${self.port}`);
         debug(`[${self.node_env}] Express server listening on port ${self.port}`);
 
 
         self.logger.info('{bold:Server URLs:}');
         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:=======================================}');
+        self.logger.unprefixed('info', '{grey:=======================================}');
+        self.logger.unprefixed('info', `         APP: {magenta:http://localhost:${self.port}}`);
+        self.logger.unprefixed('info', '{grey:=======================================}');
 
 
         // setup for dev
         // setup for dev
         if (self.node_env === 'development') {
         if (self.node_env === 'development') {
@@ -388,7 +383,7 @@ Crowi.prototype.start = function() {
       });
       });
 
 
       io = require('socket.io')(server);
       io = require('socket.io')(server);
-      io.sockets.on('connection', function (socket) {
+      io.sockets.on('connection', function(socket) {
       });
       });
       self.io = io;
       self.io = io;
 
 
@@ -452,7 +447,7 @@ Crowi.prototype.buildServer = function() {
  */
  */
 Crowi.prototype.setupRoutesAtLast = function(app) {
 Crowi.prototype.setupRoutesAtLast = function(app) {
   require('../routes')(this, app);
   require('../routes')(this, app);
-}
+};
 
 
 /**
 /**
  * require API for plugins
  * require API for plugins
@@ -464,12 +459,14 @@ Crowi.prototype.setupRoutesAtLast = function(app) {
  */
  */
 Crowi.prototype.require = function(modulePath) {
 Crowi.prototype.require = function(modulePath) {
   return require(modulePath);
   return require(modulePath);
-}
+};
 
 
 Crowi.prototype.exitOnError = function(err) {
 Crowi.prototype.exitOnError = function(err) {
   debug('Critical error occured.');
   debug('Critical error occured.');
+  /* eslint-disable no-console */
   console.error(err);
   console.error(err);
   console.error(err.stack);
   console.error(err.stack);
+  /* eslint-enable */
   process.exit(1);
   process.exit(1);
 };
 };