Skip to content

Commit 9d4e234

Browse files
committed
feat(logging): Add colors and log-level options to run-command
Add colors and log-level arguments to run argument. Refactor log-setup functions for server and init. Correct bug in server where log-level was ignored before `parseConfig` Closing #1067
1 parent db4ada5 commit 9d4e234

File tree

3 files changed

+6
-18
lines changed

3 files changed

+6
-18
lines changed

lib/cli.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,9 @@ var describeRun = function () {
186186
.describe('fail-on-empty-test-suite', 'Fail on empty test suite.')
187187
.describe('no-fail-on-empty-test-suite', 'Do not fail on empty test suite.')
188188
.describe('help', 'Print usage.')
189+
.describe('log-level', '<disable | error | warn | info | debug> Level of logging.')
190+
.describe('colors', 'Use colors when reporting and printing logs.')
191+
.describe('no-colors', 'Do not use colors when reporting or printing logs.')
189192
}
190193

191194
var describeStop = function () {

lib/init.js

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@ var exec = require('child_process').exec
66

77
var helper = require('./helper')
88
var logger = require('./logger')
9-
var constant = require('./constants')
109

1110
var log = logger.create('init')
1211

@@ -211,21 +210,13 @@ var processAnswers = function (answers, basePath, testMainFile) {
211210
}
212211

213212
exports.init = function (config) {
214-
var useColors = true
215-
var logLevel = constant.LOG_INFO
213+
logger.setupFromConfig(config)
214+
216215
var colorScheme = COLOR_SCHEME.ON
217216

218217
if (helper.isDefined(config.colors)) {
219218
colorScheme = config.colors ? COLOR_SCHEME.ON : COLOR_SCHEME.OFF
220-
useColors = config.colors
221-
}
222-
223-
if (helper.isDefined(config.logLevel)) {
224-
logLevel = config.logLevel
225219
}
226-
227-
logger.setup(logLevel, useColors)
228-
229220
// need to be registered before creating readlineInterface
230221
process.stdin.on('keypress', function (s, key) {
231222
sm.onKeypress(key)

lib/server.js

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,17 +43,11 @@ function createSocketIoServer (webServer, executor, config) {
4343
return server
4444
}
4545

46-
function setupLogger (level, colors) {
47-
var logLevel = logLevel || constant.LOG_INFO
48-
var logColors = helper.isDefined(colors) ? colors : true
49-
logger.setup(logLevel, logColors, [constant.CONSOLE_APPENDER])
50-
}
51-
5246
// Constructor
5347
var Server = function (cliOptions, done) {
5448
EventEmitter.call(this)
5549

56-
setupLogger(cliOptions.logLevel, cliOptions.colors)
50+
logger.setupFromConfig(cliOptions)
5751

5852
this.log = logger.create()
5953

0 commit comments

Comments
 (0)