X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=libmemcached%2Fio.c;h=3b5d44f570e2003313963a6c70a1600287f382ba;hb=d46b596b82e290141fd97e3c5381efdb792756a4;hp=efb0efad8dafc2ad9c574fabad2b6469ca85c410;hpb=813fb1ae11f915b3dbcb4f7a457261f9c377212a;p=awesomized%2Flibmemcached

diff --git a/libmemcached/io.c b/libmemcached/io.c
index efb0efad..3b5d44f5 100644
--- a/libmemcached/io.c
+++ b/libmemcached/io.c
@@ -12,6 +12,8 @@
 
 #include "common.h"
 
+#include <assert.h>
+
 typedef enum {
   MEM_READ,
   MEM_WRITE
@@ -408,7 +410,6 @@ static ssize_t _io_write(memcached_server_write_instance_st ptr,
       sent_length= io_flush(ptr, &rc);
       if (sent_length == -1)
       {
-        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
         return -1;
       }
 
@@ -618,6 +619,7 @@ static ssize_t io_flush(memcached_server_write_instance_st ptr,
     if (ptr->type == MEMCACHED_CONNECTION_UDP)
       increment_udp_message_id(ptr);
 
+    assert(ptr->fd != -1);
     sent_length= send(ptr->fd, local_write_ptr, write_length, 0);
     if (sent_length == SOCKET_ERROR)
     {
@@ -655,10 +657,14 @@ static ssize_t io_flush(memcached_server_write_instance_st ptr,
           fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
           return -1;
         }
+      case ENOTCONN:
+      case EPIPE:
       default:
+        fprintf(stderr, "%s %u  %u %u\n", ptr->hostname, ptr->port, ptr->io_bytes_sent, ptr->server_failure_counter);
+        fprintf(stderr, "%s:%d (%s)(%s)\n", __FILE__, __LINE__,__func__, strerror(errno));fflush(stdout);
         memcached_quit_server(ptr, true);
         *error= MEMCACHED_ERRNO;
-        fprintf(stderr, "%s:%d (%s)\n", __FILE__, __LINE__,__func__);fflush(stdout);
+        assert(ptr->fd == -1);
         return -1;
       }
     }