dilim/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2026-08-08 09:01:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

journal: refactor out loop that processes deferred closes into its own function

Browse Source
This commit is contained in:
Lennart Poettering
2018-10-25 17:42:30 +02:00
parent 180e7f4e62
commit f760d8a858
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/journal/journald-server.c
View 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) {