]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
journal: refactor out loop that processes deferred closes into its own function
authorLennart Poettering <lennart@poettering.net>
Thu, 25 Oct 2018 15:42:30 +0000 (17:42 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 25 Oct 2018 19:43:09 +0000 (21:43 +0200)
src/journal/journald-server.c

index e0ec438b1e65956ed5a3f5c8ad211d16b8375c4b..1f19a56696b99a778cdd42ce86f3f7ed90f18a35 100644 (file)
@@ -459,6 +459,18 @@ static int do_rotate(
         return r;
 }
 
+static void server_process_deferred_closes(Server *s) {
+        JournalFile *f;
+        Iterator i;
+
+        /* Perform any deferred closes which aren't still offlining. */
+        SET_FOREACH(f, s->deferred_closes, i)
+                if (!journal_file_is_offlining(f)) {
+                        (void) set_remove(s->deferred_closes, f);
+                        (void) journal_file_close(f);
+                }
+}
+
 void server_rotate(Server *s) {
         JournalFile *f;
         void *k;
@@ -479,12 +491,7 @@ void server_rotate(Server *s) {
                         ordered_hashmap_remove(s->user_journals, k);
         }
 
-        /* Perform any deferred closes which aren't still offlining. */
-        SET_FOREACH(f, s->deferred_closes, i)
-                if (!journal_file_is_offlining(f)) {
-                        (void) set_remove(s->deferred_closes, f);
-                        (void) journal_file_close(f);
-                }
+        server_process_deferred_closes(s);
 }
 
 void server_sync(Server *s) {