picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

log: make show_color variable tristate 

Should not change any behavior.
This commit is contained in:
Yu Watanabe 2020-12-09 01:44:36 +09:00
parent 5941112e7e
commit db987463fe
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/basic/log.c
View File

@ -51,7 +51,7 @@ static int journal_fd = -1;
static bool syslog_is_stream = false; static bool syslog_is_stream = false;
static bool show_color = false; static int show_color = -1; /* tristate */
static bool show_location = false; static bool show_location = false;
static bool show_time = false; static bool show_time = false;
static bool show_tid = false; static bool show_tid = false;
@ -398,12 +398,12 @@ static int write_to_console(
iovec[n++] = IOVEC_MAKE_STRING(tid_string); iovec[n++] = IOVEC_MAKE_STRING(tid_string);
} }
if (show_color) if (log_get_show_color())
get_log_colors(LOG_PRI(level), &on, &off, NULL); get_log_colors(LOG_PRI(level), &on, &off, NULL);
if (show_location) { if (show_location) {
const char *lon = "", *loff = ""; const char *lon = "", *loff = "";
if (show_color) { if (log_get_show_color()) {
lon = ANSI_HIGHLIGHT_YELLOW4; lon = ANSI_HIGHLIGHT_YELLOW4;
loff = ANSI_NORMAL; loff = ANSI_NORMAL;
} }
@ -1221,7 +1221,7 @@ void log_show_color(bool b) {
} }
bool log_get_show_color(void) { bool log_get_show_color(void) {
return show_color; return show_color > 0; /* Defaults to false. */
} }
void log_show_location(bool b) { void log_show_location(bool b) {