Upgrade custom logger to allow silly and extend create table timeout (#…

…109)
CatalysmsServerManager · Jun 9, 2020 · 02a0cc0 · 02a0cc0
1 parent c37995f
commit 02a0cc0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 21 deletions.
diff --git a/config/customLog.js b/config/customLog.js
@@ -1,14 +1,8 @@
 const winston = require("winston");
 
-let logLevel = process.env.CSMM_LOGLEVEL;
+const logLevel = process.env.CSMM_LOGLEVEL || 'info';
 
-if (!logLevel) {
-  logLevel = "debug";
-}
-
-if (logLevel !== "debug" && logLevel !== "info") {
-  throw new Error(`Invalid log level given, please select "debug" or "info"`);
-}
+const infoAndAbove = ['info', 'warn', 'blank', 'crit'];
 
 const transports = [
   new winston.transports.File({
@@ -25,18 +19,18 @@ const transports = [
   })
 ];
 
-if (logLevel === "debug") {
+if (!infoAndAbove.includes(logLevel)) {
   transports.push(
     new winston.transports.Console({
-      level: "debug",
+      level: logLevel,
       colorize: true,
       timestamp: true,
       humanReadableUnhandledException: true
     })
   );
   transports.push(
     new winston.transports.File({
-      level: "debug",
+      level: logLevel,
       name: "debuglog",
       timestamp: true,
       humanReadableUnhandledException: true,

diff --git a/config/log.js b/config/log.js
@@ -13,12 +13,11 @@
 // Load env vars
 require('dotenv').config();
 
-
-customLogger = require('./customLog').customLogger;
-
 module.exports.log = {
+  level: process.env.CSMM_LOGLEVEL || 'info',
+
   // Pass in our custom logger, and pass all log levels through.
-  custom: customLogger,
+  custom: require('./customLog').customLogger,
 
   //  Disable captain's log so it doesn't prefix or stringify our meta data.
   inspect: false

diff --git a/create_tables.js b/create_tables.js
@@ -8,12 +8,7 @@ process.env.DISCORDBOTTOKEN = '';
 process.env.NODE_ENV = 'development';
 
 const configOverrides = Object.assign({}, require('./config/env/production.js'), {
-  hookTimeout: 4000,
-  log: {
-    level: 'error',
-    custom: null,
-    inspect: true
-  },
+  hookTimeout: 60000,
   hooks: {
     /* This should get shared somewhere */
     views: false,