Commit f24a0bc1 authored by antirez's avatar antirez
Browse files

In redisIsSupervised() use MSG_NOSIGNAL only for Linux.

parent ff01ce55
......@@ -61,6 +61,11 @@
#define HAVE_BACKTRACE 1
#endif
/* MSG_NOSIGNAL. */
#ifdef __linux__
#define HAVE_MSG_NOSIGNAL 1
#endif
/* Test for polling API */
#ifdef __linux__
#define HAVE_EPOLL 1
......
......@@ -3586,6 +3586,7 @@ int redisIsSupervised(void) {
struct sockaddr_un su;
struct iovec iov;
struct msghdr hdr;
int sendto_flags = 0;
if (upstart_job == NULL && notify_socket == NULL)
return 0;
......@@ -3631,8 +3632,11 @@ int redisIsSupervised(void) {
hdr.msg_iovlen = 1;
unsetenv("NOTIFY_SOCKET");
if (sendmsg(fd, &hdr, MSG_NOSIGNAL) < 0) {
redisLog(REDIS_WARNING, "cannot send notification to systemd");
#ifdef HAVE_MSG_NOSIGNAL
sendto_flags |= MSG_NOSIGNAL;
#endif
if (sendmsg(fd, &hdr, sendto_flags) < 0) {
redisLog(REDIS_WARNING, "Cannot send notification to systemd");
close(fd);
return 0;
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment