chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
journald: allow restarting journald without losing stream connections
[elogind.git]
/
src
/
journal
/
journald-server.c
diff --git
a/src/journal/journald-server.c
b/src/journal/journald-server.c
index 461355003952d359158f9fcbee399fa4e1e95ee1..e0a078ee3306f591596291315d7abaafc74c3a08 100644
(file)
--- a/
src/journal/journald-server.c
+++ b/
src/journal/journald-server.c
@@
-1182,6
+1182,10
@@
int server_process_datagram(sd_event_source *es, int fd, uint32_t revents, void
log_error_errno(errno, "recvmsg() failed: %m");
return -errno;
}
log_error_errno(errno, "recvmsg() failed: %m");
return -errno;
}
+ if (n == 0) {
+ log_error("Got EOF on socket.");
+ return -ECONNRESET;
+ }
for (cmsg = CMSG_FIRSTHDR(&msghdr); cmsg; cmsg = CMSG_NXTHDR(&msghdr, cmsg)) {
for (cmsg = CMSG_FIRSTHDR(&msghdr); cmsg; cmsg = CMSG_NXTHDR(&msghdr, cmsg)) {
@@
-1462,6
+1466,7
@@
static int server_open_hostname(Server *s) {
}
int server_init(Server *s) {
}
int server_init(Server *s) {
+ _cleanup_fdset_free_ FDSet *fds = NULL;
int n, r, fd;
assert(s);
int n, r, fd;
assert(s);
@@
-1558,26
+1563,33
@@
int server_init(Server *s) {
s->audit_fd = fd;
} else {
s->audit_fd = fd;
} else {
- log_warning("Unknown socket passed as file descriptor %d, ignoring.", fd);
- /* Let's close the fd, better be safe than
- sorry. The fd might reference some resource
- that we really want to release if we don't
- make use of it. */
+ if (!fds) {
+ fds = fdset_new();
+ if (!fds)
+ return log_oom();
+ }
- safe_close(fd);
+ r = fdset_put(fds, fd);
+ if (r < 0)
+ return log_oom();
}
}
}
}
- r = server_open_s
yslog_socket(
s);
+ r = server_open_s
tdout_socket(s, fd
s);
if (r < 0)
return r;
if (r < 0)
return r;
- r = server_open_native_socket(s);
+ if (fdset_size(fds) > 0) {
+ log_warning("%u unknown file descriptors passed, closing.", fdset_size(fds));
+ fds = fdset_free(fds);
+ }
+
+ r = server_open_syslog_socket(s);
if (r < 0)
return r;
if (r < 0)
return r;
- r = server_open_
stdout
_socket(s);
+ r = server_open_
native
_socket(s);
if (r < 0)
return r;
if (r < 0)
return r;