shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

journald: Log error when failed to get machine-id on start

Browse Source 
Can help since the journal requires /etc/machine-id to exists in order to start,
and will simply silently exit when it does not.
This commit is contained in:
Olivier Brunel 2013-09-12 14:37:30 +02:00 committed by Lennart Poettering
parent fcba531ed4
commit 00a1686189
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/journal/journald-server.c
View File

@ -897,8 +897,10 @@ static int system_journal_open(Server *s) {
char ids[33];
r = sd_id128_get_machine(&machine);
if (r < 0)
if (r < 0) {
log_error("Failed to get machine id: %s", strerror(-r));
return r;
}
sd_id128_to_string(machine, ids);
@ -1000,10 +1002,8 @@ int server_flush_to_var(Server *s) {
log_debug("Flushing to /var...");
r = sd_id128_get_machine(&machine);
if (r < 0) {
log_error("Failed to get machine id: %s", strerror(-r));
if (r < 0)
return r;
}
r = sd_journal_open(&j, SD_JOURNAL_RUNTIME_ONLY);
if (r < 0) {