[systemd-commits] 3 commits - TODO src/journal src/tmpfiles

[Lennart Poettering]

 TODO                          |    2 ++
 src/journal/journald-server.c |    4 ++--
 src/journal/journald.conf     |    4 ++--
 src/tmpfiles/tmpfiles.c       |    2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

New commits:
commit f123dba8b13cc629ff53056aabe253426cbb6a5e
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jun 21 15:57:47 2013 +0200

    update TODO

diff --git a/TODO b/TODO
index e11e85c..caba4e3 100644
--- a/TODO
+++ b/TODO
@@ -28,6 +28,8 @@ Fedora 19:
 
 Features:
 
+* journald: make sure ratelimit is actually really per-service with the new cgroup changes
+
 * when creating a session or machine, automatically move the process into the root cgroup for all other hierarchies
 
 * maybe reintroduce nspawn -C?

commit 96ca81944e40d9bc75d8599e216ee3babe0f5f81
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jun 21 15:57:42 2013 +0200

    tmpfiles: fix error check

diff --git a/src/tmpfiles/tmpfiles.c b/src/tmpfiles/tmpfiles.c
index f4885ec..555347a 100644
--- a/src/tmpfiles/tmpfiles.c
+++ b/src/tmpfiles/tmpfiles.c
@@ -783,7 +783,7 @@ static int create_item(Item *i) {
 
                 r = glob_item(i, item_set_perms);
                 if (r < 0)
-                        return 0;
+                        return r;
                 break;
 
         case RECURSIVE_RELABEL_PATH:

commit 7f1ad696a273703789b624fe0b209fb63e953016
Author: Lennart Poettering <lennart at poettering.net>
Date:   Fri Jun 21 15:56:45 2013 +0200

    journald: bump the journal per-unit ratelimit defaults
    
    Too many people kept hitting them, so let's increase the limits a bit.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=965803

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index ae65f02..c7d047a 100644
--- a/src/journal/journald-server.c
+++ b/src/journal/journald-server.c
@@ -65,8 +65,8 @@
 #define USER_JOURNALS_MAX 1024
 
 #define DEFAULT_SYNC_INTERVAL_USEC (5*USEC_PER_MINUTE)
-#define DEFAULT_RATE_LIMIT_INTERVAL (10*USEC_PER_SEC)
-#define DEFAULT_RATE_LIMIT_BURST 200
+#define DEFAULT_RATE_LIMIT_INTERVAL (30*USEC_PER_SEC)
+#define DEFAULT_RATE_LIMIT_BURST 1000
 
 #define RECHECK_AVAILABLE_SPACE_USEC (30*USEC_PER_SEC)
 
diff --git a/src/journal/journald.conf b/src/journal/journald.conf
index 5410477..54f6833 100644
--- a/src/journal/journald.conf
+++ b/src/journal/journald.conf
@@ -13,8 +13,8 @@
 #Seal=yes
 #SplitMode=login
 #SyncIntervalSec=5m
-#RateLimitInterval=10s
-#RateLimitBurst=200
+#RateLimitInterval=30s
+#RateLimitBurst=1000
 #SystemMaxUse=
 #SystemKeepFree=
 #SystemMaxFileSize=