summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-04-14 20:47:20 -0500
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2015-04-14 21:47:20 -0400
commit40acc203c043fd419f3c045dc6f116c3a28411d8 (patch)
tree90225de6df71dac9ace80ecb466dc5bbbe337f9d /src
parent813a71a206f9f8dc7f824299e94404f8bfdafd91 (diff)
systemctl: avoid bumping NOFILE rlimit unless needed
We actually only use the journal when showing status. Move setrlimit call so it is only called for status. https://bugzilla.redhat.com/show_bug.cgi?id=1184712
Diffstat (limited to 'src')
-rw-r--r--src/systemctl/systemctl.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 75d709d317..4e702fb8bc 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -4466,6 +4466,12 @@ static int show(sd_bus *bus, char **args) {
if (show_properties)
pager_open_if_enabled();
+ if (show_status)
+ /* Increase max number of open files to 16K if we can, we
+ * might needs this when browsing journal files, which might
+ * be split up into many files. */
+ setrlimit_closest(RLIMIT_NOFILE, &RLIMIT_MAKE_CONST(16384));
+
/* If no argument is specified inspect the manager itself */
if (show_properties && strv_length(args) <= 1)
@@ -7164,11 +7170,6 @@ found:
}
}
- /* Increase max number of open files to 16K if we can, we
- * might needs this when browsing journal files, which might
- * be split up into many files. */
- setrlimit_closest(RLIMIT_NOFILE, &RLIMIT_MAKE_CONST(16384));
-
return verb->dispatch(bus, argv + optind);
}