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

[Lennart Poettering]

 TODO                     |   10 +---------
 src/journal/sd-journal.c |   14 ++++++++++----
 2 files changed, 11 insertions(+), 13 deletions(-)

New commits:
commit 773ba90946e7b3bdc6162379f929eb4303f249db
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 7 01:01:33 2012 +0200

    update TODO

diff --git a/TODO b/TODO
index 8acf45e..7fb9dd3 100644
--- a/TODO
+++ b/TODO
@@ -133,8 +133,6 @@ Features:
   /sys/firmware/efi/vars/LoaderTicksStartMenu-4a67b082-0a4c-41cf-b6c7-440b29bb8c4f/data
   (only set if the menu was active)
 
-* new dependency type to "group" services in a target
-
 * change Requires=basic.target to RequisiteOverride=basic.target
 
 * support rd.luks.allow-discards= kernel cmdline params in cryptsetup generator
@@ -269,8 +267,6 @@ Features:
 
 * logind: add equivalent to sd_pid_get_owner_uid() to the D-Bus API
 
-* write RPM spec macros for presets
-
 * journal: API for looking for retrieving "all values of this field"
 
 * journal: deal nicely with byte-by-byte copied files, especially regards header
@@ -310,8 +306,6 @@ Features:
 
 * default to actual 32bit PIDs, via /proc/sys/kernel/pid_max
 
-* add an option to make mounts private/shareable and so on, enable this for root by default
-
 * be able to specify a forced restart of service A where service B depends on, in case B
   needs to be auto-respawned?
 
@@ -415,7 +409,7 @@ Features:
     http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=99ee5315dac6211e972fa3f23bcc9a0343ff58c4
 
 * implicitly import "defaults" settings file into all types
-* exec settings override
+
 * writable cgroups dbus properties for live changes
 
 * read config fragments for all units from /lib/systemd/system/foobar.service.d/ to override/extend specific settings

commit de2c390731e563db0ee383bfd0073fdbef643ca2
Author: Lennart Poettering <lennart at poettering.net>
Date:   Tue Aug 7 00:51:17 2012 +0200

    journalctl: include corrupted files in output
    
    If a journal file was rotated away because it was corrupted or dirty we
    should still show its contents via "journalctl".

diff --git a/TODO b/TODO
index 6d99afe..8acf45e 100644
--- a/TODO
+++ b/TODO
@@ -47,8 +47,6 @@ Bugfixes:
 
 Features:
 
-* .journal~ files should be parsed too
-
 * allow services with no ExecStart= but with an ExecStop=
 
 * add proper journal support to "systemctl --user status ..."
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index fd0fb57..33686ed 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1098,7 +1098,9 @@ static int add_file(sd_journal *j, const char *prefix, const char *filename) {
 
         if ((j->flags & SD_JOURNAL_SYSTEM_ONLY) &&
             !(streq(filename, "system.journal") ||
-             (startswith(filename, "system@") && endswith(filename, ".journal"))))
+              streq(filename, "system.journal~") ||
+              (startswith(filename, "system@") &&
+               (endswith(filename, ".journal") || endswith(filename, ".journal~")))))
                 return 0;
 
         path = strjoin(prefix, "/", filename, NULL);
@@ -1246,7 +1248,8 @@ static int add_directory(sd_journal *j, const char *prefix, const char *dirname)
                 if (r != 0 || !de)
                         break;
 
-                if (dirent_is_file_with_suffix(de, ".journal")) {
+                if (dirent_is_file_with_suffix(de, ".journal") ||
+                    dirent_is_file_with_suffix(de, ".journal~")) {
                         r = add_file(j, m->path, de->d_name);
                         if (r < 0)
                                 log_debug("Failed to add file %s/%s: %s", m->path, de->d_name, strerror(-r));
@@ -1324,7 +1327,8 @@ static int add_root_directory(sd_journal *j, const char *p) {
                 if (r != 0 || !de)
                         break;
 
-                if (dirent_is_file_with_suffix(de, ".journal")) {
+                if (dirent_is_file_with_suffix(de, ".journal") ||
+                    dirent_is_file_with_suffix(de, ".journal~")) {
                         r = add_file(j, m->path, de->d_name);
                         if (r < 0)
                                 log_debug("Failed to add file %s/%s: %s", m->path, de->d_name, strerror(-r));
@@ -1823,7 +1827,9 @@ static void process_inotify_event(sd_journal *j, struct inotify_event *e) {
         if (d) {
                 sd_id128_t id;
 
-                if (!(e->mask & IN_ISDIR) && e->len > 0 && endswith(e->name, ".journal")) {
+                if (!(e->mask & IN_ISDIR) && e->len > 0 &&
+                    (endswith(e->name, ".journal") ||
+                     endswith(e->name, ".journal~"))) {
 
                         /* Event for a journal file */