luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-01-28 15:06:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2530-namespaced-journald' into 'main'

Browse Source 
gmessages: Support namespaced journals

Closes #2530

See merge request GNOME/glib!2338
This commit is contained in:
Sebastian Dröge 2021-11-16 15:11:09 +00:00
commit 42f5a3ec20
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
glib/gmessages.c
View File

@ -2225,10 +2225,14 @@ g_log_writer_is_journald (gint output_fd)
if (output_fd < 0) if (output_fd < 0)
return FALSE; return FALSE;
/* Namespaced journals start with `/run/systemd/journal.${name}/` (see
* `RuntimeDirectory=systemd/journal.%i` in `systemd-journald@.service`. The
* default journal starts with `/run/systemd/journal/`. */
addr_len = sizeof(addr); addr_len = sizeof(addr);
err = getpeername (output_fd, &addr.sa, &addr_len); err = getpeername (output_fd, &addr.sa, &addr_len);
if (err == 0 && addr.storage.ss_family == AF_UNIX) if (err == 0 && addr.storage.ss_family == AF_UNIX)
return g_str_has_prefix (addr.un.sun_path, "/run/systemd/journal/"); return (g_str_has_prefix (addr.un.sun_path, "/run/systemd/journal/") ||
g_str_has_prefix (addr.un.sun_path, "/run/systemd/journal."));
#endif #endif
return FALSE; return FALSE;