net: log close failures in EdgeTriggerEvents and WakeupPipe

kwvg · kwvg · commit f24520a3a255 · 2024-05-14T17:23:15.000Z
diff --git a/src/util/edge.cpp b/src/util/edge.cpp
@@ -52,7 +52,10 @@ EdgeTriggeredEvents::~EdgeTriggeredEvents()
 {
     if (m_valid) {
 #if defined(USE_KQUEUE) || defined(USE_EPOLL)
-        close(m_fd);
+        if (close(m_fd) != 0) {
+            LogPrintf("Destroying EdgeTriggeredEvents instance, close() failed for m_fd = %d with error %s\n", m_fd,
+                      NetworkErrorString(WSAGetLastError()));
+        }
 #else
         assert(false);
 #endif /* defined(USE_KQUEUE) || defined(USE_EPOLL) */
diff --git a/src/util/wpipe.cpp b/src/util/wpipe.cpp
@@ -6,6 +6,7 @@
 
 #include <logging.h>
 #include <util/edge.h>
+#include <util/sock.h>
 
 WakeupPipe::WakeupPipe(EdgeTriggeredEvents* edge_trig_events)
     : m_edge_trig_events{edge_trig_events}
@@ -39,8 +40,12 @@ WakeupPipe::~WakeupPipe()
         if (m_edge_trig_events && !m_edge_trig_events->UnregisterPipe(m_pipe[0])) {
             LogPrintf("Destroying WakeupPipe instance, EdgeTriggeredEvents::UnregisterPipe() failed\n");
         }
-        close(m_pipe[0]);
-        close(m_pipe[1]);
+        for (size_t idx = 0; idx < m_pipe.size(); idx++) {
+            if (close(m_pipe[idx]) != 0) {
+                LogPrintf("Destroying WakeupPipe instance, close() failed for m_pipe[%d] = %d with error %s\n",
+                          idx, m_pipe[idx], NetworkErrorString(WSAGetLastError()));
+            }
+        }
 #else
         assert(false);
 #endif /* USE_WAKEUP_PIPE */
