mirrors/systemd
0
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-23 02:03:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

journal: Add journal.storage credential

Browse Source 
In mkosi CI, we want persistent journals when running interactively
and runtime journals when running in CI, so let's add a credential
that allows us to configure which one to use.
This commit is contained in:
Daan De Meyer 2024-04-30 12:26:27 +02:00
parent 9c53f6a7ae
commit 123450e58e
5 changed files with 68 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NEWS
View File

@ -268,6 +268,9 @@ CHANGES WITH 256-rc1:
added to control the maximum log levels for the messages sent to this
socket.
* systemd-journald now also reads the journal.storage credential when
determining where to store journal files.
* systemd-vmspawn gained a new --forward-journal= option to forward the
virtual machine's journal entries to the host. This is done over a
AF_VSOCK socket, i.e. it does not require networking in the guest.

4
man/journald.conf.xml
View File

@ -103,6 +103,10 @@
<para>Note that per-user journal files are not supported unless persistent storage is enabled, thus
making <command>journalctl --user</command> unavailable.</para>
<para>The storage to use can also be specified via the <literal>journal.storage</literal>
credential. Values configured via configuration files take priority over values configured via the
credential.</para>
<xi:include href="version-info.xml" xpointer="v186"/>
</listitem>
</varlistentry>

31
man/systemd-journald.service.xml
View File

@ -220,6 +220,37 @@ systemd-tmpfiles --create --prefix /var/log/journal</programlisting>
</variablelist>
</refsect1>
<refsect1>
<title>Credentials</title>
<para><command>systemd-journald</command> supports the service credentials logic as implemented by
<varname>ImportCredential=</varname>/<varname>LoadCredential=</varname>/<varname>SetCredential=</varname>
(see <citerefentry><refentrytitle>systemd.exec</refentrytitle><manvolnum>5</manvolnum></citerefentry> for
details). The following credentials are used when passed in:</para>
<variablelist class='system-credentials'>
<varlistentry>
<term><varname>journal.forward_to_socket</varname></term>
<listitem><para>May contain a socket address to which logs should be forwarded. See
<varname>ForwardToSocket=</varname> in
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<xi:include href="version-info.xml" xpointer="v256"/></listitem>
</varlistentry>
<varlistentry>
<term><varname>journal.storage</varname></term>
<listitem><para>May be used to specify where journal files should be stored. See
<varname>Storage=</varname> in
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry>.</para>
<xi:include href="version-info.xml" xpointer="v256"/></listitem>
</varlistentry>
</variablelist>
</refsect1>
<refsect1>
<title>Kernel Command Line</title>

12
man/systemd.system-credentials.xml
View File

@ -309,6 +309,18 @@
</listitem>
</varlistentry>
<varlistentry>
<term><varname>journal.storage</varname></term>
<listitem>
<para>Used by
<citerefentry><refentrytitle>systemd-journald</refentrytitle><manvolnum>8</manvolnum></citerefentry>
to determine where to store journal files, see
<citerefentry><refentrytitle>journald.conf</refentrytitle><manvolnum>5</manvolnum></citerefentry> for details.</para>
<xi:include href="version-info.xml" xpointer="v256"/>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>vmm.notify_socket</varname></term>
<listitem>

27
src/journal/journald-server.c
View File

@ -2522,17 +2522,27 @@ static void server_load_credentials(Server *s) {
assert(s);
/* if we already have a forward address from config don't load the credential */
if (s->forward_to_socket.sockaddr.sa.sa_family != AF_UNSPEC)
return log_debug("Socket forward address already set not loading journal.forward_to_socket");
r = read_credential("journal.forward_to_socket", &data, NULL);
if (r < 0)
return (void) log_debug_errno(r, "Failed to read credential journal.forward_to_socket, ignoring: %m");
log_debug_errno(r, "Failed to read credential journal.forward_to_socket, ignoring: %m");
else {
r = socket_address_parse(&s->forward_to_socket, data);
if (r < 0)
log_debug_errno(r, "Failed to parse socket address '%s' from credential journal.forward_to_socket, ignoring: %m", (char *) data);
}
r = socket_address_parse(&s->forward_to_socket, data);
data = mfree(data);
r = read_credential("journal.storage", &data, NULL);
if (r < 0)
log_debug_errno(r, "Failed to parse credential journal.forward_to_socket, ignoring: %m");
log_debug_errno(r, "Failed to read credential journal.storage, ignoring: %m");
else {
r = storage_from_string(data);
if (r < 0)
log_debug_errno(r, "Failed to parse storage '%s' from credential journal.storage, ignoring: %m", (char *) data);
else
s->storage = r;
}
}
int server_new(Server **ret) {
@ -2617,9 +2627,8 @@ int server_init(Server *s, const char *namespace) {
journal_reset_metrics(&s->system_storage.metrics);
journal_reset_metrics(&s->runtime_storage.metrics);
server_parse_config_file(s);
server_load_credentials(s);
server_parse_config_file(s);
if (!s->namespace) {
/* Parse kernel command line, but only if we are not a namespace instance */