diff options
| author | Lennart Poettering <lennart@poettering.net> | 2017-09-22 10:22:24 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2017-09-22 10:22:24 +0200 |
| commit | ec20fe5ffb8a00469bab209fff6c069bb93c6db2 (patch) | |
| tree | eb6658381ac31b9168c2a147f7f27248be6576e4 /man/systemd-journald.service.xml | |
| parent | d82611c9183604bcf2c2871c55b4250fcd4a7247 (diff) | |
| download | systemd-ec20fe5ffb8a00469bab209fff6c069bb93c6db2.tar.gz | |
journald: make maximum size of stream log lines configurable and bump it to 48K (#6838)
This adds a new setting LineMax= to journald.conf, and sets it by
default to 48K. When we convert stream-based stdout/stderr logging into
record-based log entries, read up to the specified amount of bytes
before forcing a line-break.
This also makes three related changes:
- When a NUL byte is read we'll not recognize this as alternative line
break, instead of silently dropping everything after it. (see #4863)
- The reason for a line-break is now encoded in the log record, if it
wasn't a plain newline. Specifically, we distuingish "nul",
"line-max" and "eof", for line breaks due to NUL byte, due to the
maximum line length as configured with LineMax= or due to end of
stream. This data is stored in the new implicit _LINE_BREAK= field.
It's not synthesized for plain \n line breaks.
- A randomized 128bit ID is assigned to each log stream.
With these three changes in place it's (mostly) possible to reconstruct
the original byte streams from log data, as (most) of the context of
the conversion from the byte stream to log records is saved now. (So,
the only bits we still drop are empty lines. Which might be something to
look into in a future change, and which is outside of the scope of this
work)
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=86465
See: #4863
Replaces: #4875
Diffstat (limited to 'man/systemd-journald.service.xml')
| -rw-r--r-- | man/systemd-journald.service.xml | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/man/systemd-journald.service.xml b/man/systemd-journald.service.xml index 559ef1090a..fec0e1fe88 100644 --- a/man/systemd-journald.service.xml +++ b/man/systemd-journald.service.xml @@ -149,8 +149,9 @@ systemd-tmpfiles --create --prefix /var/log/journal</programlisting> via the <citerefentry><refentrytitle>systemd-cat</refentrytitle><manvolnum>1</manvolnum></citerefentry> command line tool.</para> - <para> Currently, the number of parallel log streams <filename>systemd-journald</filename> will accept is limited - to 4096.</para> + <para>Currently, the number of parallel log streams <filename>systemd-journald</filename> will accept is limited to + 4096. When this limit is reached further log streams may be established but will receieve + <constant>EPIPE</constant> right from the beginning.</para> </refsect1> <refsect1> |