MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux: Minor log fix (#1092)

Browse Source 
Use colored log messages only on the terminal.
This commit is contained in:
Marcelo Aquino
2018-03-25 15:51:41 -03:00
committed by GitHub
parent ea6d07cb79
commit fb95a84e6f
1 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/Linux/log.c
+12 -17
View File
@@ -134,29 +134,24 @@ void vlog(int level, const char *fmt, va_list args)
time_t t = time(NULL); time_t t = time(NULL);
struct tm *lt = localtime(&t); struct tm *lt = localtime(&t);
char buf[16]; char date[16];
buf[strftime(buf, sizeof(buf), "%b %d %H:%M:%S", lt)] = '\0'; date[strftime(date, sizeof(date), "%b %d %H:%M:%S", lt)] = '\0';
if (_log_file_fp != NULL) {
fprintf(_log_file_fp, "%s %-5s ", date, _log_level_names[level]);
vfprintf(_log_file_fp, fmt, args);
}
if (!_log_quiet) {
#ifdef LOG_DISABLE_COLOR #ifdef LOG_DISABLE_COLOR
(void)_log_level_colors; (void)_log_level_colors;
if (!_log_quiet) { fprintf(stderr, "%s %-5s ", date, _log_level_names[level]);
fprintf(stderr, "%s %-5s ", buf, _log_level_names[level]);
vfprintf(stderr, fmt, args); vfprintf(stderr, fmt, args);
}
if (_log_file_fp != NULL) {
vfprintf(_log_file_fp, "%s %-5s ", buf, _log_level_names[level]);
vfprintf(_log_file_fp, fmt, args);
}
#else #else
if (!_log_quiet) { fprintf(stderr, "%s %s%-5s\x1b[0m ", date, _log_level_colors[level], _log_level_names[level]);
fprintf(stderr, "%s %s%-5s\x1b[0m ", buf, _log_level_colors[level], _log_level_names[level]);
vfprintf(stderr, fmt, args); vfprintf(stderr, fmt, args);
}
if (_log_file_fp != NULL) {
fprintf(_log_file_fp, "%s %s%-5s\x1b[0m ", buf, _log_level_colors[level], _log_level_names[level]);
vfprintf(_log_file_fp, fmt, args);
}
#endif #endif
}
} }
if (_log_syslog) { if (_log_syslog) {