Skip to content

Commit dd4e50a

Browse files
authored
Merge pull request #8281 from aspandey/remove-log-colors
noobaa/core: Modify debug module to chnge log color
2 parents d19fdfd + 42f3ae7 commit dd4e50a

File tree

2 files changed

+22
-11
lines changed

2 files changed

+22
-11
lines changed

config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -480,6 +480,8 @@ config.EVENT_LEVEL = 5;
480480
config.LOG_TO_STDERR_ENABLED = true;
481481
config.LOG_TO_SYSLOG_ENABLED = false;
482482

483+
config.LOG_COLOR_ENABLED = process.env.NOOBAA_LOG_COLOR ? process.env.NOOBAA_LOG_COLOR === 'true' : true;
484+
483485
// TEST Mode
484486
config.test_mode = false;
485487

src/util/debug_module.js

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ if (process.env.NOOBAA_LOG_LEVEL) {
3838
// override the default inspect options
3939
if (!util.inspect.defaultOptions) util.inspect.defaultOptions = {};
4040
util.inspect.defaultOptions.depth = 10;
41-
util.inspect.defaultOptions.colors = true;
41+
util.inspect.defaultOptions.colors = config.LOG_COLOR_ENABLED;
4242
util.inspect.defaultOptions.breakLength = Infinity;
4343

4444
//Detect our context, node/atom/browser
@@ -290,25 +290,34 @@ class InternalDebugLogger {
290290
}
291291

292292
message_format(level, args) {
293+
294+
let level_color = "";
295+
let level_str = "";
296+
let prefix = "";
293297
let msg;
298+
294299
if (args.length > 1) {
295300
msg = util.format(...args);
296301
} else {
297302
msg = args[0] || '';
298303
}
299304

300-
//Level coloring
301-
let level_color = '\x1B[31m';
302-
if (this._levels[level]) {
303-
level_color = this._levels[level] === 1 ? '\x1B[33m' : '\x1B[36m';
304-
}
305-
306-
//Level String
307-
const level_str = level_color + `[${level}]`.padStart(7) + '\x1B[39m';
308-
309305
const proc = '[' + this._proc_name + '/' + this._pid + '] ';
310306
const ftime = formatted_time();
311-
const prefix = '\x1B[32m' + ftime + '\x1B[35m ' + proc;
307+
308+
//Level coloring and string
309+
if (config.LOG_COLOR_ENABLED) {
310+
level_color = '\x1B[31m';
311+
if (this._levels[level]) {
312+
level_color = this._levels[level] === 1 ? '\x1B[33m' : '\x1B[36m';
313+
}
314+
level_str = level_color + `[${level}]`.padStart(7) + '\x1B[39m';
315+
prefix = '\x1B[32m' + ftime + '\x1B[35m ' + proc;
316+
} else {
317+
level_str = `[${level}]`.padStart(7);
318+
prefix = ftime + proc;
319+
}
320+
312321
msg = level_str + msg;
313322
const msg_oneline = strip_newlines(msg);
314323

0 commit comments

Comments
 (0)