SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #32464 from YHNdnzj/journal-object-invocation-id

Browse Source 
journal: small fixes for OBJECT_SYSTEMD_INVOCATION_ID
This commit is contained in:
Yu Watanabe
2024-04-25 06:40:45 +09:00
committed by GitHub
parent dc3058e490 3cb7fc5fcb
commit 68ee2ba1ee
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
man/systemd.journal-fields.xml
+14 -5
View File
@@ -546,8 +546,7 @@
<varlistentry>
<term><varname>OBJECT_PID=<replaceable>PID</replaceable></varname></term>
<listitem>
<para>PID of the program that this message pertains to.
</para>
<para>PID of the program that this message pertains to.</para>
<xi:include href="version-info.xml" xpointer="v205"/>
</listitem>
@@ -567,9 +566,8 @@
<term><varname>OBJECT_SYSTEMD_UNIT=</varname></term>
<term><varname>OBJECT_SYSTEMD_USER_UNIT=</varname></term>
<listitem>
<para>These are additional fields added automatically by
<command>systemd-journald</command>. Their meaning is the
same as
<para>These are additional fields added automatically by <command>systemd-journald</command>.
Their meaning is the same as
<varname>_UID=</varname>,
<varname>_GID=</varname>,
<varname>_COMM=</varname>,
@@ -589,6 +587,17 @@
<xi:include href="version-info.xml" xpointer="v205"/>
</listitem>
</varlistentry>
<varlistentry>
<term><varname>OBJECT_SYSTEMD_INVOCATION_ID=</varname></term>
<listitem>
<para>An additional field added automatically by <command>systemd-journald</command>. The meaning
is mostly the same as <varname>_SYSTEMD_INVOCATION_ID=</varname>, with the difference described
above.</para>
<xi:include href="version-info.xml" xpointer="v235"/>
</listitem>
</varlistentry>
</variablelist>
</refsect1>
src/journal/journald-server.c
+1 -1
View File
@@ -1144,7 +1144,7 @@ static void server_dispatch_message_real(
IOVEC_ADD_STRING_FIELD(iovec, n, o->slice, "OBJECT_SYSTEMD_SLICE");
IOVEC_ADD_STRING_FIELD(iovec, n, o->user_slice, "OBJECT_SYSTEMD_USER_SLICE");
IOVEC_ADD_ID128_FIELD(iovec, n, o->invocation_id, "OBJECT_SYSTEMD_INVOCATION_ID=");
IOVEC_ADD_ID128_FIELD(iovec, n, o->invocation_id, "OBJECT_SYSTEMD_INVOCATION_ID");
}
assert(n <= m);