DEFINE_STRING_TABLE_LOOKUP(storage, Storage);
DEFINE_CONFIG_PARSE_ENUM(config_parse_storage, storage, Storage, "Failed to parse storage setting");
+static const char* const split_mode_table[] = {
+ [SPLIT_NONE] = "none",
+ [SPLIT_UID] = "uid",
+ [SPLIT_LOGIN] = "login"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(split_mode, SplitMode);
+DEFINE_CONFIG_PARSE_ENUM(config_parse_split_mode, split_mode, SplitMode, "Failed to parse split mode setting");
+
static uint64_t available_space(Server *s) {
char ids[33], *p;
const char *f;
for (;;) {
struct stat st;
- struct dirent buf, *de;
+ struct dirent *de;
+ union dirent_storage buf;
- r = readdir_r(d, &buf, &de);
+ r = readdir_r(d, &buf.de, &de);
if (r != 0)
break;
Iterator i;
int r;
- log_info("Rotating...");
+ log_debug("Rotating...");
if (s->runtime_journal) {
r = journal_file_rotate(&s->runtime_journal, s->compress, false);
log_error("Failed to create user journal: %s", strerror(-r));
else {
hashmap_replace(s->user_journals, k, f);
- server_fix_perms(s, s->system_journal, PTR_TO_UINT32(k));
+ server_fix_perms(s, f, PTR_TO_UINT32(k));
}
}
}
sd_id128_t machine;
int r;
- log_info("Vacuuming...");
+ log_debug("Vacuuming...");
r = sd_id128_get_machine(&machine);
if (r < 0) {
sd_id128_to_string(machine, ids);
if (s->system_journal) {
- if (asprintf(&p, "/var/log/journal/%s", ids) < 0) {
+ p = strappend("/var/log/journal/", ids);
+ if (!p) {
log_oom();
return;
}
}
if (s->runtime_journal) {
- if (asprintf(&p, "/run/log/journal/%s", ids) < 0) {
+ p = strappend("/run/log/journal/", ids);
+ if (!p) {
log_oom();
return;
}
return;
if (journal_file_rotate_suggested(f)) {
- log_info("Journal header limits reached or header out-of-date, rotating.");
+ log_debug("Journal header limits reached or header out-of-date, rotating.");
server_rotate(s);
server_vacuum(s);
vacuumed = true;
}
if (r == -E2BIG || r == -EFBIG || r == EDQUOT || r == ENOSPC)
- log_info("Allocation limit reached, rotating.");
+ log_debug("Allocation limit reached, rotating.");
else if (r == -EHOSTDOWN)
log_info("Journal file from other machine, rotating.");
else if (r == -EBUSY)
- log_info("Unlcean shutdown, rotating.");
+ log_info("Unclean shutdown, rotating.");
else
log_warning("Journal file corrupted, rotating.");
if (!f)
return;
- log_info("Retrying write.");
+ log_debug("Retrying write.");
}
}
assert(n <= m);
- write_to_journal(s, realuid == 0 ? 0 : loginuid, iovec, n);
+ write_to_journal(s,
+ s->split_mode == SPLIT_NONE ? 0 :
+ (s->split_mode == SPLIT_UID ? realuid :
+ (realuid == 0 ? 0 : loginuid)), iovec, n);
free(pid);
free(uid);
char_array_0(buffer);
IOVEC_SET_STRING(iovec[n++], buffer);
- snprintf(mid, sizeof(mid), "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(message_id));
- char_array_0(mid);
- IOVEC_SET_STRING(iovec[n++], mid);
+ if (!sd_id128_equal(message_id, SD_ID128_NULL)) {
+ snprintf(mid, sizeof(mid), "MESSAGE_ID=" SD_ID128_FORMAT_STR, SD_ID128_FORMAT_VAL(message_id));
+ char_array_0(mid);
+ IOVEC_SET_STRING(iovec[n++], mid);
+ }
zero(ucred);
ucred.pid = getpid();
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)
+ if (r >= 0) {
+ char fb[FORMAT_BYTES_MAX];
+
server_fix_perms(s, s->system_journal, 0);
- else if (r < 0) {
+ server_driver_message(s, SD_ID128_NULL, "Allowing system journal files to grow to %s.",
+ format_bytes(fb, sizeof(fb), s->system_metrics.max_use));
+
+ } else if (r < 0) {
if (r != -ENOENT && r != -EROFS)
log_warning("Failed to open system journal: %s", strerror(-r));
}
}
- if (s->runtime_journal)
+ if (s->runtime_journal) {
+ char fb[FORMAT_BYTES_MAX];
+
server_fix_perms(s, s->runtime_journal, 0);
+ server_driver_message(s, SD_ID128_NULL, "Allowing runtime journal files to grow to %s.",
+ format_bytes(fb, sizeof(fb), s->runtime_metrics.max_use));
+ }
}
return r;
if (!s->system_journal)
return 0;
- log_info("Flushing to /var...");
+ log_debug("Flushing to /var...");
r = sd_id128_get_machine(&machine);
if (r < 0) {
r = journal_file_copy_entry(f, s->system_journal, o, f->current_offset, NULL, NULL, NULL);
if (r == -E2BIG) {
- log_info("Allocation limit reached.");
+ log_debug("Allocation limit reached.");
journal_file_post_change(s->system_journal);
server_rotate(s);
ssize_t n;
if (ev->events != EPOLLIN) {
- log_info("Got invalid event from epoll.");
+ log_error("Got invalid event from epoll.");
return -EIO;
}
int r;
if (ev->events != EPOLLIN) {
- log_info("Got invalid event from epoll.");
+ log_error("Got invalid event from epoll.");
return -EIO;
}
ev->data.fd == s->syslog_fd) {
if (ev->events != EPOLLIN) {
- log_info("Got invalid event from epoll.");
+ log_error("Got invalid event from epoll.");
return -EIO;
}
} else if (ev->data.fd == s->stdout_fd) {
if (ev->events != EPOLLIN) {
- log_info("Got invalid event from epoll.");
+ log_error("Got invalid event from epoll.");
return -EIO;
}
StdoutStream *stream;
if ((ev->events|EPOLLIN|EPOLLHUP) != (EPOLLIN|EPOLLHUP)) {
- log_info("Got invalid event from epoll.");
+ log_error("Got invalid event from epoll.");
return -EIO;
}
return 0;
}
-static void maybe_append_tags(Server *s) {
+static void server_maybe_append_tags(Server *s) {
#ifdef HAVE_GCRYPT
JournalFile *f;
Iterator i;
log_set_target(LOG_TARGET_SAFE);
log_set_facility(LOG_SYSLOG);
- log_set_max_level(LOG_DEBUG);
log_parse_environment();
log_open();
break;
}
- maybe_append_tags(&server);
+ server_maybe_append_tags(&server);
+ server_maybe_warn_forward_syslog_missed(&server);
}
log_debug("systemd-journald stopped as pid %lu", (unsigned long) getpid());