mirror of
https://github.com/swaywm/sway.git
synced 2024-10-31 21:47:24 +00:00
Merge pull request #1419 from 4e554c4c/better_logs
Print log level even if STDERR is not a tty
This commit is contained in:
parent
cf43670529
commit
0f7e84c110
23
common/log.c
23
common/log.c
|
@ -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;
|
||||||
|
|
Loading…
Reference in a new issue