diff options
Diffstat (limited to 'src/journal')
-rw-r--r-- | src/journal/journald-gperf.gperf | 5 | ||||
-rw-r--r-- | src/journal/journald.c | 9 | ||||
-rw-r--r-- | src/journal/journald.conf | 3 | ||||
-rw-r--r-- | src/journal/journald.h | 1 |
4 files changed, 11 insertions, 7 deletions
diff --git a/src/journal/journald-gperf.gperf b/src/journal/journald-gperf.gperf index d4019dd664..2f83cbde7c 100644 --- a/src/journal/journald-gperf.gperf +++ b/src/journal/journald-gperf.gperf @@ -14,9 +14,11 @@ struct ConfigPerfItem; %struct-type %includes %% +Journal.Storage, config_parse_storage, 0, offsetof(Server, storage) +Journal.Compress, config_parse_bool, 0, offsetof(Server, compress) +Journal.Seal, config_parse_bool, 0, offsetof(Server, seal) Journal.RateLimitInterval, config_parse_usec, 0, offsetof(Server, rate_limit_interval) Journal.RateLimitBurst, config_parse_unsigned, 0, offsetof(Server, rate_limit_burst) -Journal.Compress, config_parse_bool, 0, offsetof(Server, compress) Journal.SystemMaxUse, config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_use) Journal.SystemMaxFileSize, config_parse_bytes_off, 0, offsetof(Server, system_metrics.max_size) Journal.SystemMinFileSize, config_parse_bytes_off, 0, offsetof(Server, system_metrics.min_size) @@ -33,4 +35,3 @@ Journal.MaxLevelStore, config_parse_level, 0, offsetof(Server, max_leve Journal.MaxLevelSyslog, config_parse_level, 0, offsetof(Server, max_level_syslog) Journal.MaxLevelKMsg, config_parse_level, 0, offsetof(Server, max_level_kmsg) Journal.MaxLevelConsole, config_parse_level, 0, offsetof(Server, max_level_console) -Journal.Storage, config_parse_storage, 0, offsetof(Server, storage) diff --git a/src/journal/journald.c b/src/journal/journald.c index f74c46158a..7b3b6471de 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -316,7 +316,7 @@ static JournalFile* find_journal(Server *s, uid_t uid) { journal_file_close(f); } - r = journal_file_open_reliably(p, O_RDWR|O_CREAT, 0640, s->compress, false, &s->system_metrics, s->mmap, s->system_journal, &f); + r = journal_file_open_reliably(p, O_RDWR|O_CREAT, 0640, s->compress, s->seal, &s->system_metrics, s->mmap, s->system_journal, &f); free(p); if (r < 0) @@ -353,7 +353,7 @@ static void server_rotate(Server *s) { } if (s->system_journal) { - r = journal_file_rotate(&s->system_journal, s->compress, true); + r = journal_file_rotate(&s->system_journal, s->compress, s->seal); if (r < 0) if (s->system_journal) log_error("Failed to rotate %s: %s", s->system_journal->path, strerror(-r)); @@ -365,7 +365,7 @@ static void server_rotate(Server *s) { } HASHMAP_FOREACH_KEY(f, k, s->user_journals, i) { - r = journal_file_rotate(&f, s->compress, false); + r = journal_file_rotate(&f, s->compress, s->seal); if (r < 0) if (f->path) log_error("Failed to rotate %s: %s", f->path, strerror(-r)); @@ -2007,7 +2007,7 @@ static int system_journal_open(Server *s) { if (!fn) return -ENOMEM; - r = journal_file_open_reliably(fn, O_RDWR|O_CREAT, 0640, s->compress, true, &s->system_metrics, s->mmap, NULL, &s->system_journal); + r = journal_file_open_reliably(fn, O_RDWR|O_CREAT, 0640, s->compress, s->seal, &s->system_metrics, s->mmap, NULL, &s->system_journal); free(fn); if (r >= 0) @@ -2771,6 +2771,7 @@ static int server_init(Server *s) { zero(*s); s->syslog_fd = s->native_fd = s->stdout_fd = s->signal_fd = s->epoll_fd = s->dev_kmsg_fd = -1; s->compress = true; + s->seal = true; s->rate_limit_interval = DEFAULT_RATE_LIMIT_INTERVAL; s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST; diff --git a/src/journal/journald.conf b/src/journal/journald.conf index ab7b4abec5..677f48b7e3 100644 --- a/src/journal/journald.conf +++ b/src/journal/journald.conf @@ -8,7 +8,9 @@ # See journald.conf(5) for details [Journal] +#Storage=auto #Compress=yes +#Seal=yes #RateLimitInterval=10s #RateLimitBurst=200 #SystemMaxUse= @@ -27,4 +29,3 @@ #MaxLevelSyslog=debug #MaxLevelKMsg=notice #MaxLevelConsole=info -#Storage=auto diff --git a/src/journal/journald.h b/src/journal/journald.h index 0202893d86..13f2f1f5d1 100644 --- a/src/journal/journald.h +++ b/src/journal/journald.h @@ -68,6 +68,7 @@ typedef struct Server { JournalMetrics system_metrics; bool compress; + bool seal; bool forward_to_kmsg; bool forward_to_syslog; |