fix bug for flora service

if socket write timeout, should shutdown the socket
yodaos-project · Jul 13, 2019 · b546016 · b546016
1 parent 1691599
commit b546016
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/src/sock-adap.cc b/src/sock-adap.cc
@@ -110,8 +110,10 @@ int32_t SocketAdapter::write(const void *data, uint32_t size) {
   if (r < 0) {
     KLOGE(TAG, "write to socket failed: %s", strerror(errno));
     close_nolock();
-    if (errno == EAGAIN)
+    if (errno == EAGAIN) {
+      ::shutdown(socketfd, SHUT_RDWR);
       return -2;
+    }
     return -1;
   }
   return 0;

diff --git a/src/sock-poll.cc b/src/sock-poll.cc
@@ -165,6 +165,8 @@ void SocketPoll::run() {
           if (it != adapters.end()) {
             KLOGD(TAG, "read from fd %d", ifd);
             if (!do_read(it->second)) {
+              KLOGD(TAG, "delete adapter %s",
+                  it->second->info ? it->second->info->name.c_str() : "");
               delete_adapter(it->second);
               adapters.erase(it);
             }