diff --git a/Makefile-man.am b/Makefile-man.am
index a900b8d25a..013e0d7967 100644
--- a/Makefile-man.am
+++ b/Makefile-man.am
@@ -2272,19 +2272,25 @@ endif
if HAVE_MICROHTTPD
MANPAGES += \
man/journal-remote.conf.5 \
+ man/journal-upload.conf.5 \
man/systemd-journal-gatewayd.service.8 \
man/systemd-journal-remote.8 \
man/systemd-journal-upload.8
MANPAGES_ALIAS += \
man/journal-remote.conf.d.5 \
+ man/journal-upload.conf.d.5 \
man/systemd-journal-gatewayd.8 \
man/systemd-journal-gatewayd.socket.8
man/journal-remote.conf.d.5: man/journal-remote.conf.5
+man/journal-upload.conf.d.5: man/journal-upload.conf.5
man/systemd-journal-gatewayd.8: man/systemd-journal-gatewayd.service.8
man/systemd-journal-gatewayd.socket.8: man/systemd-journal-gatewayd.service.8
man/journal-remote.conf.d.html: man/journal-remote.conf.html
$(html-alias)
+man/journal-upload.conf.d.html: man/journal-upload.conf.html
+ $(html-alias)
+
man/systemd-journal-gatewayd.html: man/systemd-journal-gatewayd.service.html
$(html-alias)
@@ -2607,6 +2613,7 @@ EXTRA_DIST += \
man/hostnamectl.xml \
man/hwdb.xml \
man/journal-remote.conf.xml \
+ man/journal-upload.conf.xml \
man/journalctl.xml \
man/journald.conf.xml \
man/kernel-command-line.xml \
diff --git a/man/journal-remote.conf.xml b/man/journal-remote.conf.xml
index 2d345963d9..f7ac8c46e0 100644
--- a/man/journal-remote.conf.xml
+++ b/man/journal-remote.conf.xml
@@ -45,22 +45,21 @@
journal-remote.conf
journal-remote.conf.d
- Journal remote service configuration files
+ Configuration files for the service accepting remote journal uploads
/etc/systemd/journal-remote.conf
- /etc/systemd/journald.conf.d/*.conf
- /run/systemd/journald.conf.d/*.conf
- /usr/lib/systemd/journald.conf.d/*.conf
+ /etc/systemd/journal-remote.conf.d/*.conf
+ /run/systemd/journal-remote.conf.d/*.conf
+ /usr/lib/systemd/journal-remote.conf.d/*.conf
Description
- These files configure various parameters of the systemd-remote-journal
- application,
- systemd-journal-remote8.
+ These files configure various parameters of
+ systemd-journal-remote.service8.
diff --git a/man/journal-upload.conf.xml b/man/journal-upload.conf.xml
new file mode 100644
index 0000000000..e3be62dfd1
--- /dev/null
+++ b/man/journal-upload.conf.xml
@@ -0,0 +1,113 @@
+
+
+
+
+
+
+
+ journal-upload.conf
+ systemd
+
+
+
+ Monkey with a keyboard
+ Zbigniew
+ Jędrzejewski-Szmek
+ zbyszek@in.waw.pl
+
+
+
+
+
+ journal-upload.conf
+ 5
+
+
+
+ journal-upload.conf
+ journal-upload.conf.d
+ Configuration files for the journal upload service
+
+
+
+ /etc/systemd/journal-upload.conf
+ /etc/systemd/journal-upload.conf.d/*.conf
+ /run/systemd/journal-upload.conf.d/*.conf
+ /usr/lib/systemd/journal-upload.conf.d/*.conf
+
+
+
+ Description
+
+ These files configure various parameters of
+ systemd-journal-upload.service8.
+
+
+
+
+
+ Options
+
+ All options are configured in the [Upload] section:
+
+
+
+ URL=
+
+ The URL to upload the journal entries to. See the description
+ of --url= option in
+ systemd-journal-upload8
+ for the description of possible values.
+
+
+
+ ServerKeyFile=
+
+ SSL key in PEM format.
+
+
+
+ ServerCertificateFile=
+
+ SSL CA certificate in PEM format.
+
+
+
+ TrustedCertificateFile=
+
+ SSL CA certificate.
+
+
+
+
+
+
+
+ See Also
+
+ systemd-journal-upload8,
+ systemd1,
+ systemd-journald.service8
+
+
+
+
diff --git a/man/sd-journal.xml b/man/sd-journal.xml
index 936a83acf7..0f4b3e8eea 100644
--- a/man/sd-journal.xml
+++ b/man/sd-journal.xml
@@ -98,6 +98,21 @@
tool.
+
+ Thread safety
+
+ Functions that operate on the sd_journal object are thread
+ agnostic — given sd_journal pointer may only be used from one thread at
+ a time, but multiple threads may use multiple such objects safely. Other functions —
+ those that are used to send entries to the journal, like
+ sd_journal_print3
+ and similar, or those that are used to retrieve global information like
+ sd_journal_stream_fd3
+ and
+ sd_journal_get_catalog_for_message_id3
+ — are thread-safe and may be called from multiple threads in parallel.
+
+
diff --git a/man/sd_journal_add_match.xml b/man/sd_journal_add_match.xml
index 98415d53fd..7c64329aed 100644
--- a/man/sd_journal_add_match.xml
+++ b/man/sd_journal_add_match.xml
@@ -168,6 +168,9 @@
Notes
+ All functions listed here are thread-agnostic and only a single thread may operate
+ on a given sd_journal object.
+
The sd_journal_add_match(),
sd_journal_add_disjunction(),
sd_journal_add_conjunction() and
diff --git a/man/sd_journal_enumerate_fields.xml b/man/sd_journal_enumerate_fields.xml
index fa5884106b..bc2c21ed4b 100644
--- a/man/sd_journal_enumerate_fields.xml
+++ b/man/sd_journal_enumerate_fields.xml
@@ -110,6 +110,9 @@
Notes
+ All functions listed here are thread-agnostic and only a single thread may operate
+ on a given sd_journal object.
+
The sd_journal_enumerate_fields() and sd_journal_restart_fields()
interfaces are available as a shared library, which can be compiled and linked to with the
libsystemd
Notes
+ Function sd_journal_get_catalog() is thread-agnostic and only a
+ single thread may operate on a given sd_journal object. Function
+ sd_journal_get_catalog_for_message_id() is thread-safe.
+
The sd_journal_get_catalog() and
sd_journal_get_catalog_for_message_id()
interfaces are available as a shared library, which can be
diff --git a/man/sd_journal_get_cursor.xml b/man/sd_journal_get_cursor.xml
index a400d8b1b5..b7aa05f8b2 100644
--- a/man/sd_journal_get_cursor.xml
+++ b/man/sd_journal_get_cursor.xml
@@ -122,6 +122,9 @@
Notes
+ All functions listed here are thread-agnostic and only a single thread may operate
+ on a given sd_journal object.
+
The sd_journal_get_cursor() and
sd_journal_test_cursor() interfaces are
available as a shared library, which can be compiled and linked to
diff --git a/man/sd_journal_get_cutoff_realtime_usec.xml b/man/sd_journal_get_cutoff_realtime_usec.xml
index 23e7cc65e8..0950e11b44 100644
--- a/man/sd_journal_get_cutoff_realtime_usec.xml
+++ b/man/sd_journal_get_cutoff_realtime_usec.xml
@@ -120,6 +120,9 @@
Notes
+ All functions listed here are thread-agnostic and only a single thread may operate
+ on a given sd_journal object.
+
The
sd_journal_get_cutoff_realtime_usec() and
sd_journal_get_cutoff_monotonic_usec()
diff --git a/man/sd_journal_get_usage.xml b/man/sd_journal_get_usage.xml
index 72c804d834..06b0ff534d 100644
--- a/man/sd_journal_get_usage.xml
+++ b/man/sd_journal_get_usage.xml
@@ -80,6 +80,9 @@
Notes
+ All functions listed here are thread-agnostic and only a single thread may operate
+ on a given sd_journal object.
+
The sd_journal_get_usage() interface is
available as a shared library, which can be compiled and linked to
with the
diff --git a/man/sd_journal_has_runtime_files.xml b/man/sd_journal_has_runtime_files.xml
index 237e649206..3f6d56ca77 100644
--- a/man/sd_journal_has_runtime_files.xml
+++ b/man/sd_journal_has_runtime_files.xml
@@ -85,6 +85,18 @@
+
+ Notes
+
+ All functions listed here are thread-agnostic and only a single thread may operate
+ on a given sd_journal object.
+
+ Functions listed here are available as a shared library, which can be compiled and linked
+ to with the libsystemd pkg-config1
+ file.
+
+
See Also
diff --git a/man/sd_journal_next.xml b/man/sd_journal_next.xml
index 115fe26661..7c385de260 100644
--- a/man/sd_journal_next.xml
+++ b/man/sd_journal_next.xml
@@ -146,6 +146,9 @@
Notes
+ All functions listed here are thread-agnostic and only a single thread may operate
+ on a given sd_journal object.
+
The sd_journal_next(),
sd_journal_previous(),
sd_journal_next_skip() and
diff --git a/man/sd_journal_open.xml b/man/sd_journal_open.xml
index 74e67023b5..25b3048f2e 100644
--- a/man/sd_journal_open.xml
+++ b/man/sd_journal_open.xml
@@ -208,6 +208,9 @@
Notes
+ All functions listed here are thread-agnostic and only a single thread may operate
+ on a given sd_journal object.
+
The sd_journal_open(),
sd_journal_open_directory() and
sd_journal_close() interfaces are available
diff --git a/man/sd_journal_print.xml b/man/sd_journal_print.xml
index 76542527fc..2d8dd635aa 100644
--- a/man/sd_journal_print.xml
+++ b/man/sd_journal_print.xml
@@ -201,9 +201,10 @@ sd_journal_send("MESSAGE=Hello World, this is PID %lu!", (unsigned long) getpid(
- Async signal safety
- sd_journal_sendv() is "async signal
- safe" in the meaning of
+ Thread safety
+ All functions listed here are thread-safe and may be called in parallel from multiple threads.
+
+ sd_journal_sendv() is "async signal safe" in the meaning of
signal7.
diff --git a/man/sd_journal_query_unique.xml b/man/sd_journal_query_unique.xml
index dbff55c105..d7a41a039c 100644
--- a/man/sd_journal_query_unique.xml
+++ b/man/sd_journal_query_unique.xml
@@ -150,6 +150,9 @@
Notes
+ All functions listed here are thread-agnostic and only a single thread may operate
+ on a given sd_journal object.
+
The sd_journal_query_unique(),
sd_journal_enumerate_unique() and
sd_journal_restart_unique() interfaces are
diff --git a/man/sd_journal_seek_head.xml b/man/sd_journal_seek_head.xml
index d74c2d5bbc..985073496c 100644
--- a/man/sd_journal_seek_head.xml
+++ b/man/sd_journal_seek_head.xml
@@ -144,6 +144,9 @@
Notes
+ All functions listed here are thread-agnostic and only a single thread may operate
+ on a given sd_journal object.
+
The sd_journal_seek_head(),
sd_journal_seek_tail(),
sd_journal_seek_monotonic_usec(),
diff --git a/man/sd_journal_stream_fd.xml b/man/sd_journal_stream_fd.xml
index 2ea7731b48..226298ae1b 100644
--- a/man/sd_journal_stream_fd.xml
+++ b/man/sd_journal_stream_fd.xml
@@ -104,6 +104,10 @@
Notes
+ Function sd_journal_stream_fd() is thread-safe and may be be called
+ from multiple threads. All calls will return the same file descriptor, although temporarily
+ multiple file descriptors may be open.
+
The sd_journal_stream_fd() interface is
available as a shared library, which can be compiled and linked to
with the
diff --git a/man/systemd.exec.xml b/man/systemd.exec.xml
index 71dc86ec2f..6228b786f7 100644
--- a/man/systemd.exec.xml
+++ b/man/systemd.exec.xml
@@ -74,6 +74,11 @@
execution specific configuration options are configured in the
[Service], [Socket], [Mount], or [Swap] sections, depending on the
unit type.
+
+ In addition, options which control resources through cgroups
+ are listed in
+ systemd.resource-control5.
+ Those options complement options listed here.
diff --git a/man/systemd.resource-control.xml b/man/systemd.resource-control.xml
index 10aefbe0c5..a97bcca9df 100644
--- a/man/systemd.resource-control.xml
+++ b/man/systemd.resource-control.xml
@@ -83,6 +83,11 @@
[Slice], [Scope], [Service], [Socket], [Mount], or [Swap]
sections, depending on the unit type.
+ In addition, options which control resources available to programs
+ executed by systemd are listed in
+ systemd.exec5.
+ Those options complement options listed here.
+
See the New
Control Group Interfaces for an introduction on how to make
@@ -751,6 +756,7 @@
systemd.socket5,
systemd.mount5,
systemd.swap5,
+ systemd.exec5,
systemd.directives7,
systemd.special7,
The documentation for control groups and specific controllers in the Linux kernel:
diff --git a/man/systemd.unit.xml b/man/systemd.unit.xml
index 79bdb2cd38..a4f5711d7a 100644
--- a/man/systemd.unit.xml
+++ b/man/systemd.unit.xml
@@ -203,9 +203,7 @@
/run/systemd/system directories. Drop-in files in /etc
take precedence over those in /run which in turn take precedence over those
in /usr/lib. Drop-in files under any of these directories take precedence
- over unit files wherever located. (Of course, since /run is temporary and
- /usr/lib is for vendors, it is unlikely drop-ins should be used in either
- of those places.)
+ over unit files wherever located.