chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sleep: drop redundant MESSAGE= prefix
[elogind.git]
/
src
/
journal
/
journald-stream.c
diff --git
a/src/journal/journald-stream.c
b/src/journal/journald-stream.c
index ee309d16b9385ca5403c2c4aaa9d0a2407e7109c..be498d4919d1d7192070403b59e93e59d8b60039 100644
(file)
--- a/
src/journal/journald-stream.c
+++ b/
src/journal/journald-stream.c
@@
-306,7
+306,7
@@
static int stdout_stream_process(sd_event_source *es, int fd, uint32_t revents,
if (errno == EAGAIN)
return 0;
if (errno == EAGAIN)
return 0;
- log_warning
(
"Failed to read from stream: %m");
+ log_warning
_errno(errno,
"Failed to read from stream: %m");
goto terminate;
}
goto terminate;
}
@@
-370,7
+370,7
@@
static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
if (errno == EAGAIN)
return 0;
if (errno == EAGAIN)
return 0;
- log_error
(
"Failed to accept stdout connection: %m");
+ log_error
_errno(errno,
"Failed to accept stdout connection: %m");
return -errno;
}
return -errno;
}
@@
-390,19
+390,19
@@
static int stdout_stream_new(sd_event_source *es, int listen_fd, uint32_t revent
r = getpeercred(fd, &stream->ucred);
if (r < 0) {
r = getpeercred(fd, &stream->ucred);
if (r < 0) {
- log_error
(
"Failed to determine peer credentials: %m");
+ log_error
_errno(errno,
"Failed to determine peer credentials: %m");
goto fail;
}
#ifdef HAVE_SELINUX
if (mac_selinux_use()) {
if (getpeercon(fd, &stream->security_context) < 0 && errno != ENOPROTOOPT)
goto fail;
}
#ifdef HAVE_SELINUX
if (mac_selinux_use()) {
if (getpeercon(fd, &stream->security_context) < 0 && errno != ENOPROTOOPT)
- log_error
(
"Failed to determine peer security context: %m");
+ log_error
_errno(errno,
"Failed to determine peer security context: %m");
}
#endif
if (shutdown(fd, SHUT_WR) < 0) {
}
#endif
if (shutdown(fd, SHUT_WR) < 0) {
- log_error
(
"Failed to shutdown writing side of socket: %m");
+ log_error
_errno(errno,
"Failed to shutdown writing side of socket: %m");
goto fail;
}
goto fail;
}
@@
-441,25
+441,19
@@
int server_open_stdout_socket(Server *s) {
};
s->stdout_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
};
s->stdout_fd = socket(AF_UNIX, SOCK_STREAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
- if (s->stdout_fd < 0) {
- log_error("socket() failed: %m");
- return -errno;
- }
+ if (s->stdout_fd < 0)
+ return log_error_errno(errno, "socket() failed: %m");
unlink(sa.un.sun_path);
r = bind(s->stdout_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
unlink(sa.un.sun_path);
r = bind(s->stdout_fd, &sa.sa, offsetof(union sockaddr_union, un.sun_path) + strlen(sa.un.sun_path));
- if (r < 0) {
- log_error("bind(%s) failed: %m", sa.un.sun_path);
- return -errno;
- }
+ if (r < 0)
+ return log_error_errno(errno, "bind(%s) failed: %m", sa.un.sun_path);
chmod(sa.un.sun_path, 0666);
chmod(sa.un.sun_path, 0666);
- if (listen(s->stdout_fd, SOMAXCONN) < 0) {
- log_error("listen(%s) failed: %m", sa.un.sun_path);
- return -errno;
- }
+ if (listen(s->stdout_fd, SOMAXCONN) < 0)
+ return log_error_errno(errno, "listen(%s) failed: %m", sa.un.sun_path);
} else
fd_nonblock(s->stdout_fd, 1);
} else
fd_nonblock(s->stdout_fd, 1);