From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 28 Sep 2012 13:41:20 +0000 (+0200)
Subject: journald: close sd_journal context after flushing to /var
X-Git-Tag: v194~27
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=80d1c5988bfd804bc9494a33a5db5a16609cdb48;p=elogind.git

journald: close sd_journal context after flushing to /var
---

diff --git a/src/journal/journald.c b/src/journal/journald.c
index 3267fffed..a1506b237 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -896,10 +896,9 @@ static int system_journal_open(Server *s) {
 }
 
 static int server_flush_to_var(Server *s) {
-        Object *o = NULL;
         int r;
         sd_id128_t machine;
-        sd_journal *j;
+        sd_journal *j = NULL;
 
         assert(s);
 
@@ -930,6 +929,7 @@ static int server_flush_to_var(Server *s) {
         }
 
         SD_JOURNAL_FOREACH(j) {
+                Object *o = NULL;
                 JournalFile *f;
 
                 f = j->current_file;
@@ -967,6 +967,9 @@ finish:
         if (r >= 0)
                 rm_rf("/run/log/journal", false, true, false);
 
+        if (j)
+                sd_journal_close(j);
+
         return r;
 }