feat(logging): Add colors and log-level options to run-command

budde377 · budde377 · commit 9d4e234560d9 · 2016-02-22T17:52:45.000+01:00
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
diff --git 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', '<disable | error | warn | info | debug> 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
@@ -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
@@ -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()
 

Original file line number	Diff line number	Diff line change
`@@ -186,6 +186,9 @@ var describeRun = function () {`
`186`	`186`	`.describe('fail-on-empty-test-suite', 'Fail on empty test suite.')`
`187`	`187`	`.describe('no-fail-on-empty-test-suite', 'Do not fail on empty test suite.')`
`188`	`188`	`.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.')`
`189`	`192`	`}`
`190`	`193`
`191`	`194`	`var describeStop = function () {`