Merge pull request #42 from sy-c/master

SO_NOSIGPIPE
AliceO2Group · Aug 4, 2020 · ff3d614 · ff3d614
2 parents 6161dca + 4c7036a
commit ff3d614
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/src/InfoLoggerClient.cxx b/src/InfoLoggerClient.cxx
@@ -34,11 +34,7 @@
 #include "infoLoggerDefaults.h"
 
 #ifndef MSG_NOSIGNAL
-  #ifdef SO_NOSIGPIPE
-    #define MSG_NOSIGNAL SO_NOSIGPIPE
-  #else
-    #define MSG_NOSIGNAL 0
-  #endif
+  #define MSG_NOSIGNAL 0
 #endif
 const int sendFlags = MSG_NOSIGNAL;
 
@@ -123,6 +119,19 @@ int InfoLoggerClient::connect() {
       throw __LINE__;
     }
     */
+
+    // configure socket to avoid SIGPIPE (when possible)
+    #ifdef SO_NOSIGPIPE
+    {
+      int optValue = 1;
+      socklen_t optLen = sizeof(optValue);
+      if (setsockopt(txSocket, SOL_SOCKET, SO_NOSIGPIPE, &optValue, optLen) == -1) {
+        if (isVerbose) log.error("setsockopt() failed: %s", strerror(errno));
+        throw __LINE__;
+      }
+    }
+    #endif
+
 
     // configure socket TX buffer size
     if (cfg.txSocketOutBufferSize != -1) {
@@ -206,6 +215,7 @@ int InfoLoggerClient::isOk()
 
 InfoLoggerClient::~InfoLoggerClient()
 {
+  isVerbose = 1;
   reconnectThreadCleanup();
   disconnect();
   if (messageBuffer.size()) {