aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichaƂ Bartoszkiewicz <mbartoszkiewicz@gmail.com>2014-06-26 22:11:35 +0200
committerLennart Poettering <lennart@poettering.net>2014-06-27 19:55:47 +0200
commite150e82097211f09b911c7784a89ef9efed713ca (patch)
tree84fbffb1800a672eb71dd522f8cf904f00ffcbed
parentman: fix sd_watchdog_enabled() prototype in man page (diff)
downloadsystemd-e150e82097211f09b911c7784a89ef9efed713ca.tar.gz
systemd-e150e82097211f09b911c7784a89ef9efed713ca.tar.bz2
systemd-e150e82097211f09b911c7784a89ef9efed713ca.zip
journald: make MaxFileSec really default to 1month
journald.conf(5) states that the default for MaxFileSec is one month, but the code didn't respect that.
-rw-r--r--src/journal/journald-server.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index a4600e331..58410a246 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -67,6 +67,7 @@
#define DEFAULT_SYNC_INTERVAL_USEC (5*USEC_PER_MINUTE)
#define DEFAULT_RATE_LIMIT_INTERVAL (30*USEC_PER_SEC)
#define DEFAULT_RATE_LIMIT_BURST 1000
+#define DEFAULT_MAX_FILE_USEC USEC_PER_MONTH
#define RECHECK_AVAILABLE_SPACE_USEC (30*USEC_PER_SEC)
@@ -1475,6 +1476,8 @@ int server_init(Server *s) {
s->forward_to_syslog = true;
s->forward_to_wall = true;
+ s->max_file_usec = DEFAULT_MAX_FILE_USEC;
+
s->max_level_store = LOG_DEBUG;
s->max_level_syslog = LOG_DEBUG;
s->max_level_kmsg = LOG_NOTICE;