diff --git a/docker-start.sh b/docker-start.sh index 37cb0f32..5e10d639 100755 --- a/docker-start.sh +++ b/docker-start.sh @@ -1,9 +1,4 @@ #!/bin/bash set -e - -# db node db/init.js - -# app -export NODE_ENV=production -exec node app.js +exec node app.js --prod $@ diff --git a/server/config/env/production.js b/server/config/env/production.js index b5be35f6..0c6c6bec 100644 --- a/server/config/env/production.js +++ b/server/config/env/production.js @@ -21,6 +21,8 @@ const url = require('url'); +const { customLogger } = require('../../utils/logger'); + module.exports = { /** * @@ -243,7 +245,24 @@ module.exports = { * */ - log: {}, + log: { + /** + * Passthrough plain log message(s) to + * custom Winston console and file logger. + * + * Note that Winston's log levels override Sails' log levels. + * Refer: https://github.com/winstonjs/winston#logging + */ + + inspect: false, + custom: customLogger, + + /** + * Removes the Sail.js init success logs (ASCII ship art). + */ + + noShip: true, + }, http: { /** diff --git a/server/config/env/test.js b/server/config/env/test.js index 982d6ab2..5dfcfbe6 100644 --- a/server/config/env/test.js +++ b/server/config/env/test.js @@ -64,5 +64,7 @@ module.exports = { }, }, - log: {}, + log: { + level: 'warn', + }, }; diff --git a/server/config/log.js b/server/config/log.js index 9e5a233d..c7563815 100644 --- a/server/config/log.js +++ b/server/config/log.js @@ -10,8 +10,6 @@ * https://sailsjs.com/docs/concepts/logging */ -const { customLogger } = require('../utils/logger'); - module.exports.log = { /** * @@ -24,20 +22,5 @@ module.exports.log = { * You may also set the level to "silent" to suppress all logs. * */ - - /** - * Passthrough plain log message(s) to - * custom Winston console and file logger. - * - * Note that Winston's log levels override Sails' log levels. - * Refer: https://github.com/winstonjs/winston#logging - */ - custom: customLogger, - inspect: false, - - /** - * Removes the Sail.js init success logs - * (ASCII ship art) for production instances. - */ - noShip: process.env.NODE_ENV === 'production', + // level: 'info', }; diff --git a/server/utils/logger.js b/server/utils/logger.js index ff012297..d1c3cc70 100644 --- a/server/utils/logger.js +++ b/server/utils/logger.js @@ -14,7 +14,7 @@ const logfile = `${process.cwd()}/logs/planka.log`; * Refer {@link https://github.com/winstonjs/winston#logging here} * for more information on Winston log levels. */ -const logLevel = process.env.NODE_ENV === 'production' ? 'info' : 'debug'; +const logLevel = 'warn'; // process.env.NODE_ENV === 'production' ? 'info' : 'debug'; const logFormat = winston.format.combine( winston.format.uncolorize(),