diff --git a/lib/cli.js b/lib/cli.js index 9d6c774c7..3a9e98823 100644 --- a/lib/cli.js +++ b/lib/cli.js @@ -186,6 +186,9 @@ var describeRun = function () { .describe('fail-on-empty-test-suite', 'Fail on empty test suite.') .describe('no-fail-on-empty-test-suite', 'Do not fail on empty test suite.') .describe('help', 'Print usage.') + .describe('log-level', ' Level of logging.') + .describe('colors', 'Use colors when reporting and printing logs.') + .describe('no-colors', 'Do not use colors when reporting or printing logs.') } var describeStop = function () { diff --git a/lib/init.js b/lib/init.js index 51e1eed7e..a257e05b2 100755 --- a/lib/init.js +++ b/lib/init.js @@ -6,7 +6,6 @@ var exec = require('child_process').exec var helper = require('./helper') var logger = require('./logger') -var constant = require('./constants') var log = logger.create('init') @@ -211,21 +210,13 @@ var processAnswers = function (answers, basePath, testMainFile) { } exports.init = function (config) { - var useColors = true - var logLevel = constant.LOG_INFO + logger.setupFromConfig(config) + var colorScheme = COLOR_SCHEME.ON if (helper.isDefined(config.colors)) { colorScheme = config.colors ? COLOR_SCHEME.ON : COLOR_SCHEME.OFF - useColors = config.colors - } - - if (helper.isDefined(config.logLevel)) { - logLevel = config.logLevel } - - logger.setup(logLevel, useColors) - // need to be registered before creating readlineInterface process.stdin.on('keypress', function (s, key) { sm.onKeypress(key) diff --git a/lib/server.js b/lib/server.js index e7f496264..739ac8617 100644 --- a/lib/server.js +++ b/lib/server.js @@ -43,17 +43,11 @@ function createSocketIoServer (webServer, executor, config) { return server } -function setupLogger (level, colors) { - var logLevel = logLevel || constant.LOG_INFO - var logColors = helper.isDefined(colors) ? colors : true - logger.setup(logLevel, logColors, [constant.CONSOLE_APPENDER]) -} - // Constructor var Server = function (cliOptions, done) { EventEmitter.call(this) - setupLogger(cliOptions.logLevel, cliOptions.colors) + logger.setupFromConfig(cliOptions) this.log = logger.create()