forked from systemd/systemd
-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
journal: explicitly sync namespaced journals before stopping socket u…
…nits Otherwise, if a service unit that requests LogNamespace= stopped before systemd-journald@.service is started, logs generated by the service will be lost, as systemd-journald@.socket is stopped and systemd-journald@.service will never started. To prevernt the issue, let's introduce another implicit dependency to a oneshot service that explicity synchronizes a namespaced journal file when the log namespace is not needed anymore. Fixes systemd#32604.
- Loading branch information
Showing
3 changed files
with
42 additions
and
5 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
# SPDX-License-Identifier: LGPL-2.1-or-later | ||
# | ||
# This file is part of systemd. | ||
# | ||
# systemd is free software; you can redistribute it and/or modify it | ||
# under the terms of the GNU Lesser General Public License as published by | ||
# the Free Software Foundation; either version 2.1 of the License, or | ||
# (at your option) any later version. | ||
|
||
[Unit] | ||
Description=Sync Journal for Namespace %i | ||
Documentation=man:systemd-journald.service(8) man:journald.conf(5) | ||
|
||
# At the time when journalctl in ExecStop= is invoked, | ||
# systemd-journald@.service may not be started yet. Hence, both socket | ||
# units must be active when journalctl is invoked. | ||
Requires=systemd-journald@%i.socket systemd-journald-varlink@%i.socket | ||
After=systemd-journald@%i.socket systemd-journald-varlink@%i.socket | ||
StopWhenUnneeded=yes | ||
|
||
[Service] | ||
ExecStop=journalctl --namespace=%i --sync | ||
Type=oneshot | ||
RemainAfterExit=yes |