Skip to content

Commit fb95a84

Browse files
authored
Linux: Minor log fix (mysensors#1092)
Use colored log messages only on the terminal.
1 parent ea6d07c commit fb95a84

File tree

1 file changed

+11
-16
lines changed

1 file changed

+11
-16
lines changed

drivers/Linux/log.c

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -134,29 +134,24 @@ void vlog(int level, const char *fmt, va_list args)
134134
time_t t = time(NULL);
135135
struct tm *lt = localtime(&t);
136136

137-
char buf[16];
138-
buf[strftime(buf, sizeof(buf), "%b %d %H:%M:%S", lt)] = '\0';
137+
char date[16];
138+
date[strftime(date, sizeof(date), "%b %d %H:%M:%S", lt)] = '\0';
139139

140-
#ifdef LOG_DISABLE_COLOR
141-
(void)_log_level_colors;
142-
if (!_log_quiet) {
143-
fprintf(stderr, "%s %-5s ", buf, _log_level_names[level]);
144-
vfprintf(stderr, fmt, args);
145-
}
146140
if (_log_file_fp != NULL) {
147-
vfprintf(_log_file_fp, "%s %-5s ", buf, _log_level_names[level]);
141+
fprintf(_log_file_fp, "%s %-5s ", date, _log_level_names[level]);
148142
vfprintf(_log_file_fp, fmt, args);
149143
}
150-
#else
144+
151145
if (!_log_quiet) {
152-
fprintf(stderr, "%s %s%-5s\x1b[0m ", buf, _log_level_colors[level], _log_level_names[level]);
146+
#ifdef LOG_DISABLE_COLOR
147+
(void)_log_level_colors;
148+
fprintf(stderr, "%s %-5s ", date, _log_level_names[level]);
149+
vfprintf(stderr, fmt, args);
150+
#else
151+
fprintf(stderr, "%s %s%-5s\x1b[0m ", date, _log_level_colors[level], _log_level_names[level]);
153152
vfprintf(stderr, fmt, args);
154-
}
155-
if (_log_file_fp != NULL) {
156-
fprintf(_log_file_fp, "%s %s%-5s\x1b[0m ", buf, _log_level_colors[level], _log_level_names[level]);
157-
vfprintf(_log_file_fp, fmt, args);
158-
}
159153
#endif
154+
}
160155
}
161156

162157
if (_log_syslog) {

0 commit comments

Comments
 (0)