chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use "Out of memory." consistantly (or with "\n")
[elogind.git]
/
src
/
journal
/
journald.c
diff --git
a/src/journal/journald.c
b/src/journal/journald.c
index 17aac8877b778f663669617e16097bc6d4456aa2..ae1fbc4bd451952aa5660d58774be7f632de9a52 100644
(file)
--- a/
src/journal/journald.c
+++ b/
src/journal/journald.c
@@
-868,7
+868,8
@@
static void forward_syslog_iovec(Server *s, const struct iovec *iovec, unsigned
return;
}
return;
}
- log_debug("Failed to forward syslog message: %m");
+ if (errno != ENOENT)
+ log_debug("Failed to forward syslog message: %m");
}
static void forward_syslog_raw(Server *s, int priority, const char *buffer, struct ucred *ucred, struct timeval *tv) {
}
static void forward_syslog_raw(Server *s, int priority, const char *buffer, struct ucred *ucred, struct timeval *tv) {
@@
-1269,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) {
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;
}
break;
}
@@
-1356,7
+1357,7
@@
static void process_native_message(
k = malloc((e - p) + 1 + l);
if (!k) {
k = malloc((e - p) + 1 + l);
if (!k) {
- log_error("Out of memory");
+ log_error("Out of memory
.
");
break;
}
break;
}
@@
-1449,7
+1450,7
@@
static void process_native_file(
p = malloc(st.st_size);
if (!p) {
p = malloc(st.st_size);
if (!p) {
- log_error("Out of memory");
+ log_error("Out of memory
.
");
return;
}
return;
}
@@
-1542,7
+1543,7
@@
static int stdout_stream_line(StdoutStream *s, char *p) {
else {
s->identifier = strdup(p);
if (!s->identifier) {
else {
s->identifier = strdup(p);
if (!s->identifier) {
- log_error("Out of memory");
+ log_error("Out of memory
.
");
return -ENOMEM;
}
}
return -ENOMEM;
}
}
@@
-1557,7
+1558,7
@@
static int stdout_stream_line(StdoutStream *s, char *p) {
else {
s->unit_id = strdup(p);
if (!s->unit_id) {
else {
s->unit_id = strdup(p);
if (!s->unit_id) {
- log_error("Out of memory");
+ log_error("Out of memory
.
");
return -ENOMEM;
}
}
return -ENOMEM;
}
}
@@
-2146,11
+2147,8
@@
finish:
journal_file_close(s->runtime_journal);
s->runtime_journal = NULL;
journal_file_close(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);
- }
+ if (r >= 0)
+ rm_rf("/run/log/journal", false, true, false);
return r;
}
return r;
}
@@
-2227,6
+2225,8
@@
static int process_event(Server *s, struct epoll_event *ev) {
return -errno;
}
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);
if (sfsi.ssi_signo == SIGUSR1) {
touch("/run/systemd/journal/flushed");
server_flush_to_var(s);
@@
-2239,7
+2239,6
@@
static int process_event(Server *s, struct epoll_event *ev) {
return 1;
}
return 1;
}
- log_debug("Received SIG%s", signal_to_string(sfsi.ssi_signo));
return 0;
} else if (ev->data.fd == s->proc_kmsg_fd) {
return 0;
} else if (ev->data.fd == s->proc_kmsg_fd) {