mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-14 06:24:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1419 from 4e554c4c/better_logs

Browse Source 
Print log level even if STDERR is not a tty
This commit is contained in:
Drew DeVault 2017-10-20 18:35:32 -04:00 committed by GitHub
commit 66d3777c14
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
common/log.c
View File

@ -22,6 +22,12 @@ static const char *verbosity_colors[] = {
[L_INFO ] = "\x1B[1;34m", [L_INFO ] = "\x1B[1;34m",
[L_DEBUG ] = "\x1B[1;30m", [L_DEBUG ] = "\x1B[1;30m",
}; };
static const char verbosity_chars[] = {
[L_SILENT] = '\0',
[L_ERROR ] = 'E',
[L_INFO ] = 'I',
[L_DEBUG ] = 'D',
};
void init_log(log_importance_t verbosity) { void init_log(log_importance_t verbosity) {
if (verbosity != L_DEBUG) { if (verbosity != L_DEBUG) {
@ -62,6 +68,16 @@ void _sway_vlog(const char *filename, int line, log_importance_t verbosity,
static struct tm *tm_info; static struct tm *tm_info;
char buffer[26]; char buffer[26];
unsigned int c = verbosity;
if (c > sizeof(verbosity_colors) / sizeof(char *) - 1) {
c = sizeof(verbosity_colors) / sizeof(char *) - 1;
}
// First, if not printing color, show the log level
if (!(colored && isatty(STDERR_FILENO)) && c != L_SILENT) {
fprintf(stderr, "%c: ", verbosity_chars[c]);
}
// get current time // get current time
t = time(NULL); t = time(NULL);
// convert time to local time (determined by the locale) // convert time to local time (determined by the locale)
@ -70,11 +86,6 @@ void _sway_vlog(const char *filename, int line, log_importance_t verbosity,
strftime(buffer, sizeof(buffer), "%x %X - ", tm_info); strftime(buffer, sizeof(buffer), "%x %X - ", tm_info);
fprintf(stderr, "%s", buffer); fprintf(stderr, "%s", buffer);
unsigned int c = verbosity;
if (c > sizeof(verbosity_colors) / sizeof(char *) - 1) {
c = sizeof(verbosity_colors) / sizeof(char *) - 1;
}
if (colored && isatty(STDERR_FILENO)) { if (colored && isatty(STDERR_FILENO)) {
fprintf(stderr, "%s", verbosity_colors[c]); fprintf(stderr, "%s", verbosity_colors[c]);
} }
@ -124,6 +135,8 @@ void sway_log_errno(log_importance_t verbosity, char* format, ...) {
if (colored && isatty(STDERR_FILENO)) { if (colored && isatty(STDERR_FILENO)) {
fprintf(stderr, "%s", verbosity_colors[c]); fprintf(stderr, "%s", verbosity_colors[c]);
} else if (c != L_SILENT) {
fprintf(stderr, "%c: ", verbosity_chars[c]);
} }
va_list args; va_list args;