Fix bug where LINGER was being set for unix sockets

MisterTea · Dec 24, 2019 · 1479bdc · 1479bdc
1 parent c457ba8
commit 1479bdc
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/src/base/TcpSocketHandler.cpp b/src/base/TcpSocketHandler.cpp
@@ -250,5 +250,13 @@ void TcpSocketHandler::initSocket(int fd) {
     FATAL_FAIL_UNLESS_EINVAL(
         setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char *)&flag, sizeof(int)));
   }
+  {
+    // Set linger if possible
+    struct linger so_linger;
+    so_linger.l_onoff = 1;
+    so_linger.l_linger = 5;
+    FATAL_FAIL_UNLESS_EINVAL(
+        setsockopt(fd, SOL_SOCKET, SO_LINGER, &so_linger, sizeof so_linger));
+  }
 }
 }  // namespace et
diff --git a/src/base/UnixSocketHandler.cpp b/src/base/UnixSocketHandler.cpp
@@ -174,14 +174,6 @@ vector<int> UnixSocketHandler::getActiveSockets() {
 }
 
 void UnixSocketHandler::initSocket(int fd) {
-  {
-    // Set linger
-    struct linger so_linger;
-    so_linger.l_onoff = 1;
-    so_linger.l_linger = 5;
-    FATAL_FAIL_UNLESS_EINVAL(
-        setsockopt(fd, SOL_SOCKET, SO_LINGER, &so_linger, sizeof so_linger));
-  }
 #ifndef MSG_NOSIGNAL
   {
     // If we don't have MSG_NOSIGNAL, use SO_NOSIGPIPE