static const char* const storage_table[] = {
[STORAGE_AUTO] = "auto",
[STORAGE_VOLATILE] = "volatile",
- [STORAGE_PERMANENT] = "permanent",
+ [STORAGE_PERSISTENT] = "persistent",
[STORAGE_NONE] = "none"
};
sd_id128_to_string(machine, ids);
if (!s->system_journal &&
- (s->storage == STORAGE_PERMANENT ||
+ (s->storage == STORAGE_PERSISTENT ||
s->storage == STORAGE_AUTO)) {
/* If in auto mode: first try to create the machine
* path, but not the prefix.
*
- * If in permanent mode: create /var/log/journal and
+ * If in persistent mode: create /var/log/journal and
* the machine path */
- if (s->storage & STORAGE_PERMANENT)
+ if (s->storage & STORAGE_PERSISTENT)
(void) mkdir("/var/log/journal/", 0755);
fn = strappend("/var/log/journal/", ids);
}
static int server_flush_to_var(Server *s) {
- char path[] = "/run/log/journal/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
Object *o = NULL;
int r;
sd_id128_t machine;
assert(s);
if (s->storage != STORAGE_AUTO &&
- s->storage != STORAGE_PERMANENT)
+ s->storage != STORAGE_PERSISTENT)
return 0;
if (!s->runtime_journal)
s->runtime_journal = NULL;
if (r >= 0) {
+ char path[] = "/run/log/journal/xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx";
sd_id128_to_string(machine, path + 17);
rm_rf(path, false, true, false);
}
s->rate_limit_burst = DEFAULT_RATE_LIMIT_BURST;
s->forward_to_syslog = true;
- s->import_proc_kmsg = true;
s->max_level_store = LOG_DEBUG;
s->max_level_syslog = LOG_DEBUG;