fixes

MisterTea · Oct 29, 2018 · c853c40 · c853c40
1 parent 157a1a6
commit c853c40
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 18 deletions.
diff --git a/src/base/PipeSocketHandler.cpp b/src/base/PipeSocketHandler.cpp
@@ -30,15 +30,6 @@ int PipeSocketHandler::connect(const SocketEndpoint& endpoint) {
     FATAL_FAIL(opts);
     opts |= O_NONBLOCK;
     FATAL_FAIL(fcntl(sockFd, F_SETFL, opts));
-    // Set linger
-    struct linger so_linger;
-    so_linger.l_onoff = 1;
-    so_linger.l_linger = 5;
-    int z =
-        setsockopt(sockFd, SOL_SOCKET, SO_LINGER, &so_linger, sizeof so_linger);
-    if (z) {
-      LOG(FATAL) << "set socket linger failed";
-    }
   }
 
   VLOG(3) << "Connecting to " << endpoint << " with fd " << sockFd;

diff --git a/src/base/ServerConnection.cpp b/src/base/ServerConnection.cpp
@@ -21,6 +21,7 @@ bool ServerConnection::acceptNewConnection(int fd) {
     return false;
   }
   VLOG(1) << "SERVER: got client socket fd: " << clientSocketFd;
+  lock_guard<std::recursive_mutex> guard(classMutex);
   clientHandlerThreadPool.push(
       [&, this](int id) { clientHandler(clientSocketFd); });
   return true;

diff --git a/src/base/TcpSocketHandler.cpp b/src/base/TcpSocketHandler.cpp
@@ -63,15 +63,6 @@ int TcpSocketHandler::connect(const SocketEndpoint &endpoint) {
       FATAL_FAIL(opts);
       opts |= O_NONBLOCK;
       FATAL_FAIL(fcntl(sockFd, F_SETFL, opts));
-      // Set linger
-      struct linger so_linger;
-      so_linger.l_onoff = 1;
-      so_linger.l_linger = 5;
-      int z = setsockopt(sockFd, SOL_SOCKET, SO_LINGER, &so_linger,
-                         sizeof so_linger);
-      if (z) {
-        LOG(FATAL) << "set socket linger failed";
-      }
     }
     VLOG(4) << "Set nonblocking";
     if (::connect(sockFd, p->ai_addr, p->ai_addrlen) == -1 &&

diff --git a/src/base/UnixSocketHandler.cpp b/src/base/UnixSocketHandler.cpp
@@ -171,6 +171,15 @@ void UnixSocketHandler::initSocket(int fd) {
                                       sizeof(struct timeval)));
   FATAL_FAIL_UNLESS_EINVAL(setsockopt(fd, SOL_SOCKET, SO_SNDTIMEO, (char *)&tv,
                                       sizeof(struct timeval)));
+  // Set linger
+  struct linger so_linger;
+  so_linger.l_onoff = 1;
+  so_linger.l_linger = 10;
+  int z =
+      setsockopt(fd, SOL_SOCKET, SO_LINGER, &so_linger, sizeof so_linger);
+  if (z) {
+    LOG(FATAL) << "set socket linger failed";
+  }
 #ifndef MSG_NOSIGNAL
   // If we don't have MSG_NOSIGNAL, use SO_NOSIGPIPE
   int val = 1;