X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fjournal%2Fjournald.c;h=ae1fbc4bd451952aa5660d58774be7f632de9a52;hb=85e9a1010d16064ce435b84f02dc585bc645aade;hp=3e7581815b562d849ea2698a605f501d0befa990;hpb=4a299a7ad547becb70e8271eaf8cdc27e8e6836a;p=elogind.git diff --git a/src/journal/journald.c b/src/journal/journald.c index 3e7581815..ae1fbc4bd 100644 --- a/src/journal/journald.c +++ b/src/journal/journald.c @@ -1270,7 +1270,7 @@ static void process_native_message( u = MAX((n+N_IOVEC_META_FIELDS+1) * 2U, 4U); c = realloc(iovec, u * sizeof(struct iovec)); if (!c) { - log_error("Out of memory"); + log_error("Out of memory."); break; } @@ -1357,7 +1357,7 @@ static void process_native_message( k = malloc((e - p) + 1 + l); if (!k) { - log_error("Out of memory"); + log_error("Out of memory."); break; } @@ -1450,7 +1450,7 @@ static void process_native_file( p = malloc(st.st_size); if (!p) { - log_error("Out of memory"); + log_error("Out of memory."); return; } @@ -1543,7 +1543,7 @@ static int stdout_stream_line(StdoutStream *s, char *p) { else { s->identifier = strdup(p); if (!s->identifier) { - log_error("Out of memory"); + log_error("Out of memory."); return -ENOMEM; } } @@ -1558,7 +1558,7 @@ static int stdout_stream_line(StdoutStream *s, char *p) { else { s->unit_id = strdup(p); if (!s->unit_id) { - log_error("Out of memory"); + log_error("Out of memory."); return -ENOMEM; } } @@ -2225,6 +2225,8 @@ static int process_event(Server *s, struct epoll_event *ev) { return -errno; } + log_info("Received SIG%s", signal_to_string(sfsi.ssi_signo)); + if (sfsi.ssi_signo == SIGUSR1) { touch("/run/systemd/journal/flushed"); server_flush_to_var(s); @@ -2237,7 +2239,6 @@ static int process_event(Server *s, struct epoll_event *ev) { return 1; } - log_debug("Received SIG%s", signal_to_string(sfsi.ssi_signo)); return 0; } else if (ev->data.fd == s->proc_kmsg_fd) {