[systemd-commits] 2 commits - TODO src/journal

[Lennart Poettering]

 TODO                          |    2 ++
 src/journal/journald-server.c |    3 +++
 2 files changed, 5 insertions(+)

New commits:
commit dc6d4ea9a668e2efdf12eab9ff41209299bbfd20
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jun 27 19:56:11 2014 +0200

    update TODO

diff --git a/TODO b/TODO
index ff11cff..083059c 100644
--- a/TODO
+++ b/TODO
@@ -25,6 +25,8 @@ External:
 
 Features:
 
+* allow users to kill or lock their own sessions
+
 * ship sleep.conf by default
 
 * support empty /etc boots nicely:

commit e150e82097211f09b911c7784a89ef9efed713ca
Author: Michał Bartoszkiewicz <mbartoszkiewicz at gmail.com>
Date:   Thu Jun 26 22:11:35 2014 +0200

    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.

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index a4600e3..58410a2 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;