summaryrefslogtreecommitdiff
path: root/src/journal/journald.c
diff options
context:
space:
mode:
authorDaniel Mack <github@zonque.org>2015-10-06 11:02:04 +0200
committerDaniel Mack <github@zonque.org>2015-10-06 11:02:04 +0200
commit6c8fe330317c159fff33ed8cce8d55a195a9445e (patch)
treec2489c18003b6c9ac915d5d9a4c7b36765689ec8 /src/journal/journald.c
parentc51abd80cf774815f57817da527639081d7002f4 (diff)
parent95c906ae0727123e45a9d88782133cac4554ddcd (diff)
Merge pull request #1452 from poettering/journal-vacuum
A variety of journal vacuuming improvements, plus an nspawn fix
Diffstat (limited to 'src/journal/journald.c')
-rw-r--r--src/journal/journald.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/journal/journald.c b/src/journal/journald.c
index b2624c6d28..83236ceba9 100644
--- a/src/journal/journald.c
+++ b/src/journal/journald.c
@@ -21,8 +21,8 @@
#include <unistd.h>
-#include "systemd/sd-messages.h"
-#include "systemd/sd-daemon.h"
+#include "sd-messages.h"
+#include "sd-daemon.h"
#include "journal-authenticate.h"
#include "journald-server.h"
@@ -54,7 +54,7 @@ int main(int argc, char *argv[]) {
if (r < 0)
goto finish;
- server_vacuum(&server);
+ server_vacuum(&server, false, false);
server_flush_to_var(&server);
server_flush_dev_kmsg(&server);
@@ -82,7 +82,7 @@ int main(int argc, char *argv[]) {
if (server.oldest_file_usec + server.max_retention_usec < n) {
log_info("Retention time reached.");
server_rotate(&server);
- server_vacuum(&server);
+ server_vacuum(&server, false, false);
continue;
}