refactor: updated loggers + admin UI improvements + setup fixes

server/core/auth.js

@@ -33,12 +33,11 @@ module.exports = {
     // Load authentication strategies
 
     const modules = _.values(autoload(path.join(WIKI.SERVERPATH, 'modules/authentication')))
-    console.info(WIKI.config.auth)
     _.forEach(modules, (strategy) => {
-      const strategyConfig = _.get(WIKI.config.auth.strategies, strategy.key, {})
+      const strategyConfig = _.get(WIKI.config.auth.strategies, strategy.key, { isEnabled: false })
       strategyConfig.callbackURL = `${WIKI.config.site.host}${WIKI.config.site.path}login/${strategy.key}/callback`
+      strategy.config = strategyConfig
       if (strategyConfig.isEnabled) {
-        console.info(strategy.title)
         try {
           strategy.init(passport, strategyConfig)
         } catch (err) {

server/core/logger.js

@@ -1,37 +1,25 @@
 const _ = require('lodash')
 const cluster = require('cluster')
-const fs = require('fs-extra')
-const path = require('path')
+const winston = require('winston')
 
 /* global WIKI */
 
 module.exports = {
   loggers: {},
   init() {
-    let winston = require('winston')
-
-    let logger = new (winston.Logger)({
+    let logger = winston.createLogger({
       level: WIKI.config.logLevel,
-      transports: []
-    })
-
-    logger.filters.push((level, msg) => {
-      let processName = (cluster.isMaster) ? 'MASTER' : `WORKER-${cluster.worker.id}`
-      return '[' + processName + '] ' + msg
+      format: winston.format.combine(
+        winston.format.colorize(),
+        winston.format.label({ label: (cluster.isMaster) ? 'MASTER' : `WORKER-${cluster.worker.id}` }),
+        winston.format.timestamp(),
+        winston.format.printf(info => `${info.timestamp} [${info.label}] ${info.level}: ${info.message}`)
+      )
     })
 
     _.forOwn(_.omitBy(WIKI.config.logging.loggers, s => s.enabled === false), (loggerConfig, loggerKey) => {
       let loggerModule = require(`../modules/logging/${loggerKey}`)
       loggerModule.init(logger, loggerConfig)
-      fs.readFile(path.join(WIKI.ROOTPATH, `assets/svg/auth-icon-${loggerKey}.svg`), 'utf8').then(iconData => {
-        logger.icon = iconData
-      }).catch(err => {
-        if (err.code === 'ENOENT') {
-          logger.icon = '[missing icon]'
-        } else {
-          logger.error(err)
-        }
-      })
       this.loggers[logger.key] = loggerModule
     })