|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
From d3db9a9911637d06c8cd5a573b87acd5e8101270 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
From: =?UTF-8?q?Micha=C5=82=20Bartoszkiewicz?= <mbartoszkiewicz@gmail.com>
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
Date: Thu, 26 Jun 2014 22:11:35 +0200
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
Subject: [PATCH] journald: make MaxFileSec really default to 1month
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
journald.conf(5) states that the default for MaxFileSec is one month,
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
but the code didn't respect that.
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
(cherry picked from commit e150e82097211f09b911c7784a89ef9efed713ca)
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
---
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
src/journal/journald-server.c | 3 +++
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
1 file changed, 3 insertions(+)
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
index 0b31d1015c..1e936704aa 100644
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
--- a/src/journal/journald-server.c
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
+++ b/src/journal/journald-server.c
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
@@ -67,6 +67,7 @@
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
#define DEFAULT_SYNC_INTERVAL_USEC (5*USEC_PER_MINUTE)
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
#define DEFAULT_RATE_LIMIT_INTERVAL (30*USEC_PER_SEC)
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
#define DEFAULT_RATE_LIMIT_BURST 1000
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
+#define DEFAULT_MAX_FILE_USEC USEC_PER_MONTH
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
#define RECHECK_AVAILABLE_SPACE_USEC (30*USEC_PER_SEC)
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
@@ -1486,6 +1487,8 @@ int server_init(Server *s) {
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
s->forward_to_syslog = true;
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
+ s->max_file_usec = DEFAULT_MAX_FILE_USEC;
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
+
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
s->max_level_store = LOG_DEBUG;
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
s->max_level_syslog = LOG_DEBUG;
|
|
Zbigniew Jędrzejewski-Szmek |
1cc3df |
s->max_level_kmsg = LOG_NOTICE;
|