diff options
| author | Lennart Poettering <lennart@poettering.net> | 2018-10-01 17:44:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2018-10-16 16:33:55 +0200 |
| commit | 1abaf4887dde91bd19b36a80475a8eb03f363590 (patch) | |
| tree | b079972de26115cb375cda6c017851f9cf6c321a /src/journal-remote/journal-upload.c | |
| parent | 99ab6fdf8c68bbe05a127b59ae03d2156d6ea856 (diff) | |
| download | systemd-1abaf4887dde91bd19b36a80475a8eb03f363590.tar.gz | |
tree-wide: uniformly bump RLIMIT_NOFILE in all our tools that access the journal
This makes use of rlimit_nofile_bump() in all tools that access the
journal. In some cases this replaces older code to achieve this, and
others we add it in where it was missing.
Diffstat (limited to 'src/journal-remote/journal-upload.c')
| -rw-r--r-- | src/journal-remote/journal-upload.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/journal-remote/journal-upload.c b/src/journal-remote/journal-upload.c index 621fd620ee..88fc51ec26 100644 --- a/src/journal-remote/journal-upload.c +++ b/src/journal-remote/journal-upload.c @@ -20,6 +20,7 @@ #include "mkdir.h" #include "parse-util.h" #include "process-util.h" +#include "rlimit-util.h" #include "sigbus.h" #include "signal-util.h" #include "string-util.h" @@ -780,6 +781,9 @@ int main(int argc, char **argv) { log_show_color(true); log_parse_environment(); + /* The journal merging logic potentially needs a lot of fds. */ + (void) rlimit_nofile_bump(HIGH_RLIMIT_NOFILE); + r = parse_config(); if (r < 0) goto finish; |