morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 08:56:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

journalctl: handle inotify exhaustion nicer

Browse Source 
Instead of failing, log that inotify wds
are exhausted and fallback to -n switch.

Fixes #1296.
This commit is contained in:
Kevin Kuehler
2018-06-19 13:56:36 -07:00
committed by Lennart Poettering
parent fee854ee8c
commit 321ed3643a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/journal/journalctl.c
View File

@@ -2392,11 +2392,13 @@ int main(int argc, char *argv[]) {
/* Opening the fd now means the first sd_journal_wait() will actually wait */
if (arg_follow) {
r = sd_journal_get_fd(j);
if (r == -EMEDIUMTYPE) {
if (r == -EMFILE) {
log_warning("Insufficent watch descriptors available. Reverting to -n.");
arg_follow = false;
} else if (r == -EMEDIUMTYPE) {
log_error_errno(r, "The --follow switch is not supported in conjunction with reading from STDIN.");
goto finish;
}
if (r < 0) {
} else if (r < 0) {
log_error_errno(r, "Failed to get journal fd: %m");
goto finish;
}