shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-28 02:50:16 +03:00
Code

journald-console: Add colors when forwarding to console

Browse Source 
Let's color output when we're forwarding to the console. To make this
work, we inherit TERM from pid 1 and use it to decide whether we should
output colors or not.
This commit is contained in:
Daan De Meyer 2023-03-16 11:22:58 +01:00
parent 197dd3a9a4
commit a4180c0fb3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/journal/journald-console.c
View File

@ -38,13 +38,13 @@ void server_forward_console(
const char *message,
const struct ucred *ucred) {
struct iovec iovec[5];
struct iovec iovec[7];
struct timespec ts;
char tbuf[STRLEN("[] ") + DECIMAL_STR_MAX(ts.tv_sec) + DECIMAL_STR_MAX(ts.tv_nsec)-3 + 1];
char header_pid[STRLEN("[]: ") + DECIMAL_STR_MAX(pid_t)];
_cleanup_free_ char *ident_buf = NULL;
_cleanup_close_ int fd = -EBADF;
const char *tty;
const char *tty, *color_on = "", *color_off = "";
int n = 0;
assert(s);
@ -81,8 +81,12 @@ void server_forward_console(
iovec[n++] = IOVEC_MAKE_STRING(": ");
}
get_log_colors(LOG_PRI(priority), &color_on, &color_off, NULL);
/* Fourth: message */
iovec[n++] = IOVEC_MAKE_STRING(color_on);
iovec[n++] = IOVEC_MAKE_STRING(message);
iovec[n++] = IOVEC_MAKE_STRING(color_off);
iovec[n++] = IOVEC_MAKE_STRING("\n");
tty = s->tty_path ?: "/dev/console";

1
units/systemd-journald.service.in
View File

@ -47,6 +47,7 @@ SystemCallArchitectures=native
SystemCallErrorNumber=EPERM
SystemCallFilter=@system-service
Type=notify
PassEnvironment=TERM
{{SERVICE_WATCHDOG}}
# In case you're wondering why CAP_SYS_PTRACE is needed, access to